diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-08-15 18:01:20 +0200 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-08-16 10:30:50 +0200 |
| commit | fa193f5dfc937a7ff8e12b9ffd21861046a46489 (patch) | |
| tree | 8607afde02908c051d461a73e02e8cc7a40ab860 /ci/test_imagefile | |
| parent | b8ee2fa02ef5cb6a559c5f459ce7215ed9f6e15c (diff) | |
| download | bitcoin-fa193f5dfc937a7ff8e12b9ffd21861046a46489.tar.xz | |
ci: Fix macOS-cross SDK rsync
This should fix the macOS-cross build on Cirrus CI containers.
Locally this was already working, because the SDK was cached in
/ci_container_base/ in the image, which is also the folder used for a
later CI run.
However, on Cirrus CI, when using an image *and* a custom BASE_ROOT_DIR,
the SDK will not be found in /ci_base_install/, nor in BASE_ROOT_DIR.
Fix this by normalizing *all* folders to /ci_container_base/.
Diffstat (limited to 'ci/test_imagefile')
| -rw-r--r-- | ci/test_imagefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/test_imagefile b/ci/test_imagefile index 8dfb5916b1..f8b5eea1c8 100644 --- a/ci/test_imagefile +++ b/ci/test_imagefile @@ -11,6 +11,6 @@ ARG FILE_ENV ENV FILE_ENV=${FILE_ENV} COPY ./ci/retry/retry /usr/bin/retry -COPY ./ci/test/00_setup_env.sh ./${FILE_ENV} ./ci/test/01_base_install.sh /ci_base_install/ci/test/ +COPY ./ci/test/00_setup_env.sh ./${FILE_ENV} ./ci/test/01_base_install.sh /ci_container_base/ci/test/ -RUN ["bash", "-c", "cd /ci_base_install/ && set -o errexit && source ./ci/test/00_setup_env.sh && ./ci/test/01_base_install.sh"] +RUN ["bash", "-c", "cd /ci_container_base/ && set -o errexit && source ./ci/test/00_setup_env.sh && ./ci/test/01_base_install.sh"] |