Skip to content

Commit e1a2206

Browse files
committed
Add https pull init support
1 parent e66c9e7 commit e1a2206

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
mkdir -p /colcon_ws/src
2323
ln -s $(realpath .) /colcon_ws/src/bitbots_meta
2424
- name: Pull our software
25-
run: awk '{sub("[email protected]:", "https://github.com/"); print " " $0}' workspace.repos | vcs import .. --skip-existing
25+
run: make pull-init --use-https
2626
working-directory: /colcon_ws/src/bitbots_meta
2727
- name: Install proprietary basler drivers
2828
run: make basler ARGS="-ci"

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
.PHONY : basler install pip pre-commit pull-all pull-init pull-files rosdep status update
22

3+
HTTPS_FLAG := --use-https
4+
35
basler:
46
scripts/make_basler.sh $(ARGS)
57

@@ -23,7 +25,11 @@ pull-all:
2325

2426
pull-init:
2527
git pull
26-
vcs import .. < workspace.repos
28+
ifeq ($(filter $(HTTPS_FLAG),$(filter-out $<,$(MAKECMDGOALS))),$(HTTPS_FLAG))
29+
awk '{sub("[email protected]:", "https://github.com/"); print " " $$0}' workspace.repos | vcs import .. --skip-existing
30+
else
31+
vcs import .. --skip-existing < workspace.repos
32+
endif
2733
scripts/pull_files.bash
2834

2935
pull-files:

0 commit comments

Comments
 (0)