From fa535a6de7a021dc24785fd76329738b737eb9f8 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Tue, 17 Jun 2025 20:12:29 +0200 Subject: [PATCH] ci: Allow running CI in worktrees --- ci/test/01_base_install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index d61aaca3f0c..908133a9200 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -6,11 +6,11 @@ export LC_ALL=C.UTF-8 -set -ex +set -o errexit -o pipefail -o xtrace -CFG_DONE="ci.base-install-done" # Use a global git setting to remember whether this script ran to avoid running it twice +CFG_DONE="${BASE_ROOT_DIR}/ci.base-install-done" # Use a global setting to remember whether this script ran to avoid running it twice -if [ "$(git config --global ${CFG_DONE})" == "true" ]; then +if [ "$( cat "${CFG_DONE}" || true )" == "done" ]; then echo "Skip base install" exit 0 fi @@ -105,4 +105,4 @@ if [ -n "$XCODE_VERSION" ] && [ ! -d "${DEPENDS_DIR}/SDKs/${OSX_SDK_BASENAME}" ] tar -C "${DEPENDS_DIR}/SDKs" -xf "$OSX_SDK_PATH" fi -git config --global ${CFG_DONE} "true" +echo -n "done" > "${CFG_DONE}"