Skip to content

Commit 743b951

Browse files
blacklist has been renamed to skiplist
1 parent f81af09 commit 743b951

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.ci/install.bash

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ do
2323
--ssh-key=* )
2424
SSH_KEY="${i#*=}" ;;
2525

26-
--bl=* | --blacklist=* )
27-
BLACKLIST="${BLACKLIST:+$BLACKLIST }${i#*=}" ;;
26+
--sl=* | --skiplist=* )
27+
SKIPLIST="${SKIPLIST:+$SKIPLIST }${i#*=}" ;;
2828

2929
* )
3030
# unknown option
@@ -38,7 +38,7 @@ do
3838
done
3939

4040
echo -e "\e[35m\e[1mBRANCH = ${BRANCH}\e[0m"
41-
echo -e "\e[35m\e[1mBLACKLIST = ${BLACKLIST}\e[0m"
41+
echo -e "\e[35m\e[1mSKIPLIST = ${SKIPLIST}\e[0m"
4242

4343
# Set default value for IMAGE_NAME
4444
[ -z "$IMAGE_NAME" ] && IMAGE_NAME='tuerobotics/tue-env'
@@ -102,18 +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-
if [ -n "$BLACKLIST" ]
105+
if [ -n "$SKIPLIST" ]
106106
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}"
107+
echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --skiplist '"${SKIPLIST}"'\e[0m'
108+
docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --skiplist '"${SKIPLIST}"
109109
fi
110110

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

115-
if [ -n "$BLACKLIST" ]
115+
if [ -n "$SKIPLIST" ]
116116
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
117+
echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --no-skiplist\e[0m'
118+
docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --no-skiplist' # Clear skiplist
119119
fi

0 commit comments

Comments
 (0)