Skip to content

Commit

Permalink
Add https pull init support
Browse files Browse the repository at this point in the history
  • Loading branch information
Flova committed Jan 18, 2024
1 parent e66c9e7 commit e1a2206
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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("[email protected]:", "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"
Expand Down
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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)

Expand All @@ -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("[email protected]:", "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:
Expand Down

0 comments on commit e1a2206

Please sign in to comment.