Skip to content

Commit fa535a6

Browse files
author
MarcoFalke
committed
ci: Allow running CI in worktrees
1 parent faf6a04 commit fa535a6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ci/test/01_base_install.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
export LC_ALL=C.UTF-8
88

9-
set -ex
9+
set -o errexit -o pipefail -o xtrace
1010

11-
CFG_DONE="ci.base-install-done" # Use a global git setting to remember whether this script ran to avoid running it twice
11+
CFG_DONE="${BASE_ROOT_DIR}/ci.base-install-done" # Use a global setting to remember whether this script ran to avoid running it twice
1212

13-
if [ "$(git config --global ${CFG_DONE})" == "true" ]; then
13+
if [ "$( cat "${CFG_DONE}" || true )" == "done" ]; then
1414
echo "Skip base install"
1515
exit 0
1616
fi
@@ -105,4 +105,4 @@ if [ -n "$XCODE_VERSION" ] && [ ! -d "${DEPENDS_DIR}/SDKs/${OSX_SDK_BASENAME}" ]
105105
tar -C "${DEPENDS_DIR}/SDKs" -xf "$OSX_SDK_PATH"
106106
fi
107107

108-
git config --global ${CFG_DONE} "true"
108+
echo -n "done" > "${CFG_DONE}"

0 commit comments

Comments
 (0)