danielsiepmann/tea
danielsiepmann/tea
1
0
mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2024-09-19 18:36:12 +02:00
Code Activity

[TASK] Tackle shellcheck issues (#1408)

Browse source 
Fixes #1398
This commit is contained in:
Felix Althaus 2024-07-31 12:22:57 +02:00 committed by GitHub
parent 2aec0534d0
commit 948505011c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Build/Scripts/runTests.sh
View file

@ -21,6 +21,7 @@ waitFor() {
done; done;
" "
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name wait-for-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_ALPINE} /bin/sh -c "${TESTCOMMAND}" ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name wait-for-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_ALPINE} /bin/sh -c "${TESTCOMMAND}"
# shellcheck disable=SC2181 # Disabled because we don‘t want to move the long line between the brackets
if [[ $? -gt 0 ]]; then if [[ $? -gt 0 ]]; then
kill -SIGINT -$$ kill -SIGINT -$$
fi fi
@ -322,10 +323,11 @@ CONTAINER_INTERACTIVE="-it --init"
HOST_UID=$(id -u) HOST_UID=$(id -u)
HOST_PID=$(id -g) HOST_PID=$(id -g)
USERSET="" USERSET=""
SUFFIX=$(echo $RANDOM) SUFFIX="$RANDOM"
NETWORK="friendsoftypo3-tea-${SUFFIX}" NETWORK="friendsoftypo3-tea-${SUFFIX}"
CI_PARAMS="${CI_PARAMS:-}" CI_PARAMS="${CI_PARAMS:-}"
CONTAINER_HOST="host.docker.internal" CONTAINER_HOST="host.docker.internal"
# shellcheck disable=SC2034 # This variable will be needed when we try to clean up the root folder
PHPSTAN_CONFIG_FILE="phpstan.neon" PHPSTAN_CONFIG_FILE="phpstan.neon"
IS_CORE_CI=0 IS_CORE_CI=0
@ -427,7 +429,7 @@ if [[ -z "${CONTAINER_BIN}" ]]; then
fi fi
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
@ -497,13 +499,13 @@ case ${TEST_SUITE} in
cleanTestFiles cleanTestFiles
;; ;;
composer) composer)
COMMAND="composer $@" COMMAND=(composer "$@")
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-command-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} /bin/sh -c "${COMMAND}" ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-command-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} "${COMMAND[@]}"
SUITE_EXIT_CODE=$? SUITE_EXIT_CODE=$?
;; ;;
composerInstall) composerInstall)
COMMAND="composer install $@" COMMAND=(composer install "$@")
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-install-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} /bin/sh -c "${COMMAND}" ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-install-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} "${COMMAND[@]}"
SUITE_EXIT_CODE=$? SUITE_EXIT_CODE=$?
;; ;;
composerInstallMax) composerInstallMax)