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/.
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | hebasto |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
<!--174a7506f384e20aa4161008e828411d-->
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
Still fails:
clang: warning: no such sysroot directory: '/tmp/cirrus-ci-build/depends/SDKs/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers' [-Wmissing-sysroot]
ld: library not found for -lc++
clang: error: linker command failed with exit code 1 (use -v to see invocation)
CI is green ðŸ«
65 | @@ -66,7 +66,7 @@ container_depends_template: &CONTAINER_DEPENDS_TEMPLATE 66 | dockerfile: ci/test_imagefile # https://cirrus-ci.org/guide/docker-builder-vm/#dockerfile-as-a-ci-environment 67 | depends_built_cache: 68 | folder: "depends/built" 69 | - fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-parse HEAD:depends) 70 | + fingerprint_script: echo salt_001 $CIRRUS_TASK_NAME $(git rev-parse HEAD:depends)
review note: This was done to manually nuke the old cache and start a new depends build/cache for all tasks on Cirrus CI.
Why is there a need to build a new depends/built cache in the first place?
Thanks, removed.
Re-run of the Cirrus task builds the depends packages regardless of caching: https://cirrus-ci.com/task/5981899345100800
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/.
This avoids "mkdir: /ci_container_base: Read-only file system"
55 | @@ -56,4 +56,4 @@ jobs: 56 | restore-keys: ${{ github.job }}-ccache-cache 57 | 58 | - name: CI script 59 | - run: ./ci/test_run_all.sh 60 | + run: env BASE_ROOT_DIR=$GITHUB_WORKSPACE ./ci/test_run_all.sh
fae6642af234cad6063945bcba7958168bf2687c, style nit, suggesting to set environment variables consistently throughout the entire ci.yml file, wherever possible:
env:
BASE_ROOT_DIR: ${{ github.workspace }}
run: ./ci/test_run_all.sh
Thanks, adjusted style
Re-run of the Cirrus task builds the depends packages regardless of caching: https://cirrus-ci.com/task/5981899345100800
Good catch. The folder was empty. Should be fixed now.
Confirmed to be fixed now, see https://cirrus-ci.com/task/5805313979318272?logs=base_depends_built#L4
ACK fa6e5d3eeffebf81b5d7ca99bf7b5e70356516ab
