File tree Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Original file line number Diff line number Diff line change 23
23
--ssh-key=* )
24
24
SSH_KEY=" ${i#* =} " ;;
25
25
26
+ --bl=* | --blacklist=* )
27
+ BLACKLIST=" ${BLACKLIST: +$BLACKLIST }${i#* =} " ;;
28
+
26
29
* )
27
30
# unknown option
28
31
if [[ -n " $i " ]]
35
38
done
36
39
37
40
echo -e " \e[35m\e[1mBRANCH = ${BRANCH} \e[0m"
41
+ echo -e " \e[35m\e[1mBLACKLIST = ${BLACKLIST} \e[0m"
38
42
39
43
# Set default value for IMAGE_NAME
40
44
[ -z " $IMAGE_NAME " ] && IMAGE_NAME=' tuerobotics/tue-env'
@@ -98,12 +102,18 @@ echo -e "\e[35m\e[1mtue-get install ros-python_orocos_kdl" "${INSTALL_BUILD_TARG
98
102
# shellcheck disable=SC2145
99
103
docker exec tue-env bash -c " source ~/.bashrc; tue-get install ros-python_orocos_kdl ${INSTALL_BUILD_TARGETS[*]} " # Needs to be installed fully as it needs to be build to generate docs
100
104
101
- echo -e ' \e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --blacklist ed\e[0m'
102
- docker exec -t tue-env bash -c ' source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --blacklist ed' # It is an exec-depend of ed_object_models, but we don't need to build it
105
+ if [ -n " $BLACKLIST " ]
106
+ then
107
+ echo -e ' \e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --blacklist ' " ${BLACKLIST} " ' \e[0m'
108
+ docker exec -t tue-env bash -c ' source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --blacklist ' " ${BLACKLIST} "
109
+ fi
103
110
104
111
echo -e " \e[35m\e[1mtue-make --no-status python_orocos_kdl" " ${INSTALL_BUILD_PKGS[*]} " " ${BUILD_PKGS[*]} " " \e[0m"
105
112
# shellcheck disable=SC2145
106
113
docker exec -t tue-env bash -c " source ~/.bashrc; tue-make --no-status python_orocos_kdl ${INSTALL_BUILD_PKGS[*]} ${BUILD_PKGS[*]} " # Needs to be build to generate docs
107
114
108
- echo -e ' \e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --no-blacklist\e[0m'
109
- docker exec -t tue-env bash -c ' source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --no-blacklist' # Clear blacklist
115
+ if [ -n " $BLACKLIST " ]
116
+ then
117
+ echo -e ' \e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --no-blacklist\e[0m'
118
+ docker exec -t tue-env bash -c ' source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --no-blacklist' # Clear blacklist
119
+ fi
Original file line number Diff line number Diff line change 23
23
BRANCH=${GITHUB_BASE_REF:-${GITHUB_REF}}
24
24
mkdir -p ${HOME}/.ssh
25
25
ssh-keyscan -t rsa -H "github.com" 2>&1 | tee -a "${HOME}"/.ssh/known_hosts
26
- .ci/install.bash --branch=$BRANCH
26
+ .ci/install.bash --branch=$BRANCH --bl=ed --bl=geolib2 --bl=rgbd # (In)direct deps of ed_object_models, but we don't need to build it
27
27
- name : Script
28
28
run : .ci/script.bash
29
29
- name : Before Deploy
You can’t perform that action at this time.
0 commit comments