From a9c86fca8fd07c28956e6dcee0f39072fcb270d4 Mon Sep 17 00:00:00 2001 From: Simeon Ehrig Date: Tue, 16 Jul 2024 16:08:06 +0200 Subject: [PATCH] fix 3 CI_FILTER: ^linux_gcc13 --- script/docker_ci.sh | 2 +- script/setup_utilities.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/script/docker_ci.sh b/script/docker_ci.sh index 6e7c9e25e0ba..c68a20215c25 100755 --- a/script/docker_ci.sh +++ b/script/docker_ci.sh @@ -200,4 +200,4 @@ then ALPAKA_DOCKER_ENV_LIST+=("--env" "alpaka_SYCL_ONEAPI_CPU_ISA=${alpaka_SYCL_ONEAPI_CPU_ISA}") fi -docker_retry docker run -v "$(pwd)":"$(pwd)" -w "$(pwd)" "${ALPAKA_DOCKER_ENV_LIST[@]}" "${ALPAKA_CI_DOCKER_BASE_IMAGE_NAME}" /bin/bash -c "source ./script/install.sh && ./script/run.sh" +docker_retry docker run -v "$(pwd)":"$(pwd)" -w "$(pwd)" "${ALPAKA_DOCKER_ENV_LIST[@]}" "${ALPAKA_CI_DOCKER_BASE_IMAGE_NAME}" /bin/bash -c "source ./script/setup_utilities.sh && source ./script/install.sh && ./script/run.sh" diff --git a/script/setup_utilities.sh b/script/setup_utilities.sh index c33b8647878b..a5733f1d56f9 100755 --- a/script/setup_utilities.sh +++ b/script/setup_utilities.sh @@ -4,6 +4,14 @@ # serveral helper function and tools for the CI +: "${ALPAKA_CI_OS_NAME?'ALPAKA_CI_OS_NAME must be specified'}" + +# enable Terminal colors for MacOS +if [ "$ALPAKA_CI_OS_NAME" = "macOS" ]; then + export CLICOLOR=1 + export LSCOLORS=ExFxCxDxBxegedabagacad +fi + # display a message in green echo_green() { echo -e "\e[1;32m$1\e[0m"