Skip to content

Commit 6e0faea

Browse files
committed
(CI) Fix blacklist option
1 parent ff4dd48 commit 6e0faea

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.ci/install.bash

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,18 @@ echo -e "\e[35m\e[1mtue-get install ros-python_orocos_kdl" "${INSTALL_BUILD_TARG
102102
# shellcheck disable=SC2145
103103
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
104104

105-
echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --blacklist' "${BLACKLIST}"'\e[0m'
106-
docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --blacklist' "${BLACKLIST}" # 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
107110

108111
echo -e "\e[35m\e[1mtue-make --no-status python_orocos_kdl" "${INSTALL_BUILD_PKGS[*]}" "${BUILD_PKGS[*]}" "\e[0m"
109112
# shellcheck disable=SC2145
110113
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
111114

112-
echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --no-blacklist\e[0m'
113-
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

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
BRANCH=${GITHUB_BASE_REF:-${GITHUB_REF}}
2424
mkdir -p ${HOME}/.ssh
2525
ssh-keyscan -t rsa -H "github.com" 2>&1 | tee -a "${HOME}"/.ssh/known_hosts
26-
.ci/install.bash --branch=$BRANCH --bl=ed --bl=geolib2
26+
.ci/install.bash --branch=$BRANCH --bl=ed --bl=geolib2 # (In)direct deps of ed_object_models, but we don't need to build it
2727
- name: Script
2828
run: .ci/script.bash
2929
- name: Before Deploy

0 commit comments

Comments
 (0)