From fa6e5d3eeffebf81b5d7ca99bf7b5e70356516ab Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Tue, 15 Aug 2023 23:27:39 +0200 Subject: [PATCH] ci: Avoid error on macOS native This avoids "mkdir: /ci_container_base: Read-only file system" --- .github/workflows/ci.yml | 1 + ci/test/00_setup_env.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6d22f033fe..44ee0b5c594 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,7 @@ jobs: CI_USE_APT_INSTALL: 'no' PACKAGE_MANAGER_INSTALL: 'echo' # Nothing to do FILE_ENV: './ci/test/00_setup_env_mac_native.sh' + BASE_ROOT_DIR: ${{ github.workspace }} steps: - name: Checkout diff --git a/ci/test/00_setup_env.sh b/ci/test/00_setup_env.sh index ca6380d3f42..c479a8a3fea 100755 --- a/ci/test/00_setup_env.sh +++ b/ci/test/00_setup_env.sh @@ -15,7 +15,7 @@ export BASE_READ_ONLY_DIR # The destination root dir inside the container. # This folder will also hold any SDKs. # This folder only exists on the ci guest and will be a copy of BASE_READ_ONLY_DIR -export BASE_ROOT_DIR="/ci_container_base" +export BASE_ROOT_DIR="${BASE_ROOT_DIR:-/ci_container_base}" # The depends dir. # This folder exists only on the ci guest, and on the ci host as a volume. export DEPENDS_DIR=${DEPENDS_DIR:-$BASE_ROOT_DIR/depends}