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 /.cirrus.yml | |
| parent | b8ee2fa02ef5cb6a559c5f459ce7215ed9f6e15c (diff) | |
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 '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 29116c9940..84bf27eb25 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -64,8 +64,8 @@ container_depends_template: &CONTAINER_DEPENDS_TEMPLATE cpu: 2 memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers dockerfile: ci/test_imagefile # https://cirrus-ci.org/guide/docker-builder-vm/#dockerfile-as-a-ci-environment - depends_built_cache: - folder: "depends/built" + base_depends_built_cache: + folder: "/ci_container_base/depends/built" fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-parse HEAD:depends) global_task_template: &GLOBAL_TASK_TEMPLATE |