diff --git a/.cirrus.yml b/.cirrus.yml index ab50a7bc73..1323ce8e95 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -338,18 +338,15 @@ alpine_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE -# Apple doesn't publish official long-term support timelines. -# We aim to support both the current and previous macOS release. +# Cirrus only supports the following macos runner currently, selecting +# anything else automatically upgrades to this one. +# +# ghcr.io/cirruslabs/macos-runner:sonoma +# +# See also: https://cirrus-ci.org/guide/macOS/ macos_sonoma_task: macos_instance: - image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest - prepare_script: ./ci/macos/prepare.sh - << : *CI_TEMPLATE - << : *MACOS_ENVIRONMENT - -macos_ventura_task: - macos_instance: - image: ghcr.io/cirruslabs/macos-ventura-base:latest + image: ghcr.io/cirruslabs/macos-runner:sonoma prepare_script: ./ci/macos/prepare.sh << : *CI_TEMPLATE << : *MACOS_ENVIRONMENT