Skip to content

Commit

Permalink
Merge #27883: ci: Bump macOS cross task to ubuntu:jammy
Browse files Browse the repository at this point in the history
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
  • Loading branch information
fanquake committed Jun 14, 2023
2 parents a8d0f6c + fa70e85 commit ff17b28
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_mac.sh
Expand Up @@ -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
Expand Down

0 comments on commit ff17b28

Please sign in to comment.