diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce2612057..25cd296cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: mkdir -p /colcon_ws/src ln -s $(realpath .) /colcon_ws/src/bitbots_meta - name: Pull our software - run: awk '{sub("git@github.com:", "https://github.com/"); print " " $0}' workspace.repos | vcs import .. --skip-existing + run: make pull-init --use-https working-directory: /colcon_ws/src/bitbots_meta - name: Install proprietary basler drivers run: make basler ARGS="-ci" diff --git a/Makefile b/Makefile index c0a09d137..917803c65 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ .PHONY : basler install pip pre-commit pull-all pull-init pull-files rosdep status update +HTTPS_FLAG := --use-https + basler: scripts/make_basler.sh $(ARGS) @@ -23,7 +25,11 @@ pull-all: pull-init: git pull - vcs import .. < workspace.repos +ifeq ($(filter $(HTTPS_FLAG),$(filter-out $<,$(MAKECMDGOALS))),$(HTTPS_FLAG)) + awk '{sub("git@github.com:", "https://github.com/"); print " " $$0}' workspace.repos | vcs import .. --skip-existing +else + vcs import .. --skip-existing < workspace.repos +endif scripts/pull_files.bash pull-files: