Skip to content

Commit ff17b28

Browse files
committed
Merge bitcoin/bitcoin#27883: ci: Bump macOS cross task to ubuntu:jammy
fa70e85 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 fa70e85 hebasto: ACK fa70e85 Tree-SHA512: ab2831a8182ca382b8af37d5395c35b5341b8f55b0ce05f4787c627cbec306cefad66713ad053228862eeac01fb8b79be7e168c41e6ec4615fbcb4ef106125b8
2 parents a8d0f6c + fa70e85 commit ff17b28

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,11 @@ task:
314314
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
315315

316316
task:
317-
name: 'macOS 10.15 [gui, no tests] [focal]'
317+
name: 'macOS 10.15 [gui, no tests] [jammy]'
318318
<< : *CONTAINER_DEPENDS_TEMPLATE
319319
container:
320320
docker_arguments:
321-
CI_IMAGE_NAME_TAG: ubuntu:focal
321+
CI_IMAGE_NAME_TAG: ubuntu:jammy
322322
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
323323
<< : *CREDITS_TEMPLATE
324324
macos_sdk_cache:

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_macos_cross
10-
export CI_IMAGE_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos
10+
export CI_IMAGE_NAME_TAG=ubuntu:22.04
1111
export HOST=x86_64-apple-darwin
1212
export PACKAGES="cmake libz-dev libtinfo5 python3-setuptools xorriso"
1313
export XCODE_VERSION=12.2

0 commit comments

Comments
 (0)