Clone repos into repo

.github/workflows/build.yml

@@ -22,16 +22,11 @@ jobs:
       - name: Install proprietary basler drivers
         run: make basler ARGS="-ci"
       - name: Install packages via rosdep
-        run: |
-          rosdep update
-          sudo apt install -y libunwind-dev
-          # Small hack to make rosdep install all dependencies at once
-          # See https://github.com/ros-infrastructure/rosdep/issues/671
-          bash -c "sudo apt install -y $(rosdep check --from-paths .. --ignore-src --rosdistro iron | sed -n 's/^apt\s\+//p' | tr '\n' ' ')"
+        run: make rosdep
       - name: Set up colcon workspace
         run: |
-          mkdir /colcon_ws
-          ls -s $(realpath ..) /colcon_ws/src
+          mkdir /colcon_ws/src
+          ls -s $(realpath .) /colcon_ws/src/bitbots_meta
       - name: Build packages
         run: |
           . /opt/ros/iron/setup.sh

.gitignore

@@ -204,7 +204,7 @@ bitbots_docs_internal
 **/cmake-build-*
 
 # Neural Network Model Path
-bitbots_vision/bitbots_vision/models/
+/bitbots_vision/bitbots_vision/models/
 
 **/.*.
 .idea/*
@@ -216,4 +216,6 @@ ansible_robots/*
 doc_internal/*
 doku/*
 
+# library subdirectories
+/lib/
 

Makefile

@@ -8,7 +8,7 @@ basler:
 install: pull-init basler update
 
 master:
-	vcs import .. < workspace.repos
+	vcs import . < workspace.repos
 
 pip:
 	# Install and upgrade pip dependencies
@@ -20,17 +20,23 @@ pre-commit:
 
 pull-all:
 	git pull
-	vcs pull ..
+	vcs pull .
 	scripts/pull_files.bash
 
 pull-init:
 	git pull
+	setup-libs
+	scripts/pull_files.bash
+
+clean-libs:
+	rm -rf lib/*
+
+setup-libs:
 ifeq ($(HTTPS), true)
-	awk '{sub("git@github.com:", "https://github.com/"); print "  " $$0}' workspace.repos | vcs import .. --skip-existing
+	awk '{sub("git@github.com:", "https://github.com/"); print "  " $$0}' workspace.repos | vcs import .
 else
-	vcs import .. --skip-existing < workspace.repos
+	vcs import . < workspace.repos
 endif
-	scripts/pull_files.bash
 
 pull-files:
 	scripts/pull_files.bash
@@ -40,9 +46,9 @@ rosdep:
 	rosdep update
 	# Small hack to make rosdep install all dependencies at once
 	# See https://github.com/ros-infrastructure/rosdep/issues/671
-	bash -c "sudo apt install -y $(rosdep check --from-paths .. --ignore-src --rosdistro iron | sed -n 's/^apt\s\+//p' | tr '\n' ' ')"
+	bash -c "sudo apt install -y $(rosdep check --from-paths . --ignore-src --rosdistro iron | sed -n 's/^apt\s\+//p' | tr '\n' ' ')"
 
 status:
-	vcs status ..
+	vcs status .
 
 update: pull-all rosdep pip pre-commit

workspace.repos

@@ -1,8 +1,4 @@
 repositories:
-  bitbots_meta:
-    type: git
-    url: git@github.com:bit-bots/bitbots_meta.git
-    version: monorepo
   lib/dynamic_stack_decider:
     type: git
     url: git@github.com:bit-bots/dynamic_stack_decider.git