mirror of
https://github.com/FriendsOfTYPO3/tea.git
synced 2024-11-10 00:16:13 +01:00
[BUGFIX] Use better supported condition checks in runTests.sh
(#1086)
With8a2e0cb
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 with8a2e0cb
. For example, conditions like ```shell if [ ${CONTAINER_BIN} = "" ]; then .. ``` are changed to ```shell if [ "${CONTAINER_BIN}" == "" ]; then .. ``` Resolves: #1085
This commit is contained in:
parent
f93010c332
commit
d97d66206f
1 changed files with 4 additions and 4 deletions
|
@ -407,18 +407,18 @@ if [ "${CI}" == "true" ]; then
|
|||
IS_CORE_CI=1
|
||||
CONTAINER_INTERACTIVE=""
|
||||
# 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}"
|
||||
fi
|
||||
CI_PARAMS="--pull=never"
|
||||
fi
|
||||
|
||||
# set default container binary, if not set using "-b" option
|
||||
if [ "${CONTAINER_BIN}" = "" ]; then
|
||||
if [ "${CONTAINER_BIN}" == "" ]; then
|
||||
CONTAINER_BIN="${DEFAULT_CONTAINER_BIN}"
|
||||
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.
|
||||
USERSET="--user $HOST_UID"
|
||||
fi
|
||||
|
@ -518,7 +518,7 @@ case ${TEST_SUITE} in
|
|||
;;
|
||||
docsGenerate)
|
||||
# @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 "TYPO3 Documentation Team needs to deal with this, and we will"
|
||||
echo "see if the upcoming php based documentation rendering container"
|
||||
|
|
Loading…
Reference in a new issue