diff options
author | fanquake <fanquake@gmail.com> | 2023-06-14 15:09:04 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2023-06-14 15:09:18 +0100 |
commit | ff17b28b0231a5145a199b89cd2e7af1de74c99f (patch) | |
tree | 9d33b9f441fd021b2953fda2be51017d890752d1 | |
parent | a8d0f6c863a088db918b17b32cd3771ce5ed5970 (diff) | |
parent | fa70e85e00f5ff7df7d74f461cdb0d47e89ed096 (diff) | |
download | bitcoin-ff17b28b0231a5145a199b89cd2e7af1de74c99f.tar.xz |
Merge bitcoin/bitcoin#27883: ci: Bump macOS cross task to ubuntu:jammy
fa70e85e00f5ff7df7d74f461cdb0d47e89ed096 ci: Bump macOS cross task to ubuntu:jammy (MarcoFalke)
Pull request description:
It shouldn't matter what underlying image is used for the task, because the compiler is fully provided by `./depends/`.
So just use the latest Ubuntu LTS, which is also most likely the OS that is used by people cross-compiling, if there are any at all.
ACKs for top commit:
fanquake:
ACK fa70e85e00f5ff7df7d74f461cdb0d47e89ed096
hebasto:
ACK fa70e85e00f5ff7df7d74f461cdb0d47e89ed096
Tree-SHA512: ab2831a8182ca382b8af37d5395c35b5341b8f55b0ce05f4787c627cbec306cefad66713ad053228862eeac01fb8b79be7e168c41e6ec4615fbcb4ef106125b8
-rw-r--r-- | .cirrus.yml | 4 | ||||
-rwxr-xr-x | ci/test/00_setup_env_mac.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index a32870f939..5a23f60d35 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -314,11 +314,11 @@ task: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV task: - name: 'macOS 10.15 [gui, no tests] [focal]' + name: 'macOS 10.15 [gui, no tests] [jammy]' << : *CONTAINER_DEPENDS_TEMPLATE container: docker_arguments: - CI_IMAGE_NAME_TAG: ubuntu:focal + CI_IMAGE_NAME_TAG: ubuntu:jammy FILE_ENV: "./ci/test/00_setup_env_mac.sh" << : *CREDITS_TEMPLATE macos_sdk_cache: diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh index fe42871c31..6ae427fd42 100755 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac.sh @@ -7,7 +7,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_macos_cross -export CI_IMAGE_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos +export CI_IMAGE_NAME_TAG=ubuntu:22.04 export HOST=x86_64-apple-darwin export PACKAGES="cmake libz-dev libtinfo5 python3-setuptools xorriso" export XCODE_VERSION=12.2 |