danielsiepmann/tea
danielsiepmann/tea
1
0
mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2024-11-22 12:36:12 +01:00
Code Activity

[BUGFIX] Use better supported condition checks in runTests.sh (#1086)

Browse source 
With 8a2e0cb the `-b` option to select the container
binary (podman or docker) has been added. During the
adoption from the TYPO3 core implementation, it has
been discoverd that the simplified checks are not
really working and changed to the better supported
version.

Sadly, it have been missed to do the at all places
correctly.

This change covers that and modifies `runTests.sh`
to use the better supported condition form for the
container binary checks introduced with 8a2e0cb.

For example, conditions like

```shell
if [ ${CONTAINER_BIN} = "" ]; then ..
```

are changed to

```shell
if [ "${CONTAINER_BIN}" == "" ]; then ..
```

Resolves: #1085
This commit is contained in:
Stefan Bürk 2023-12-19 10:19:07 +01:00 committed by GitHub
parent f93010c332
commit d97d66206f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Build/Scripts/runTests.sh
View file

@ -407,18 +407,18 @@ if [ "${CI}" == "true" ]; then
IS_CORE_CI=1 IS_CORE_CI=1
CONTAINER_INTERACTIVE="" CONTAINER_INTERACTIVE=""
# set default ci container binary, if not set using "-b" option # set default ci container binary, if not set using "-b" option
if [ ${CONTAINER_BIN} = "" ]; then if [ "${CONTAINER_BIN}" == "" ]; then
CONTAINER_BIN="${DEFAULT_CI_CONTAINER_BIN}" CONTAINER_BIN="${DEFAULT_CI_CONTAINER_BIN}"
fi fi
CI_PARAMS="--pull=never" CI_PARAMS="--pull=never"
fi fi
# set default container binary, if not set using "-b" option # set default container binary, if not set using "-b" option
if [ "${CONTAINER_BIN}" = "" ]; then if [ "${CONTAINER_BIN}" == "" ]; then
CONTAINER_BIN="${DEFAULT_CONTAINER_BIN}" CONTAINER_BIN="${DEFAULT_CONTAINER_BIN}"
fi fi
if [ $(uname) != "Darwin" ] && [ ${CONTAINER_BIN} = "docker" ]; then if [ $(uname) != "Darwin" ] && [ "${CONTAINER_BIN}" == "docker" ]; then
# Run docker jobs as current user to prevent permission issues. Not needed with podman. # Run docker jobs as current user to prevent permission issues. Not needed with podman.
USERSET="--user $HOST_UID" USERSET="--user $HOST_UID"
fi fi
@ -518,7 +518,7 @@ case ${TEST_SUITE} in
;; ;;
docsGenerate) docsGenerate)
# @todo contact the documentation team for a future rootles podman version # @todo contact the documentation team for a future rootles podman version
if [ ${CONTAINER_BIN} = "podman" ]; then if [ "${CONTAINER_BIN}" == "podman" ]; then
echo "-s docsGenerate is not usable with -b podman" echo "-s docsGenerate is not usable with -b podman"
echo "TYPO3 Documentation Team needs to deal with this, and we will" echo "TYPO3 Documentation Team needs to deal with this, and we will"
echo "see if the upcoming php based documentation rendering container" echo "see if the upcoming php based documentation rendering container"