On Tue, Sep 17, 2024 at 03:26:02PM +0200, Michal Privoznik wrote:
> libvirt-ci added macOS 15 so let's introduce it and while at it
> drop macOS 13.
>
> Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
> ---
> ci/cirrus/{macos-13.vars => macos-15.vars} | 0
> ci/gitlab/builds.yml | 32 +++++++++++-----------
> ci/manifest.yml | 14 +++++-----
> 3 files changed, 23 insertions(+), 23 deletions(-)
> rename ci/cirrus/{macos-13.vars => macos-15.vars} (100%)
>
> diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-15.vars
> similarity index 100%
> rename from ci/cirrus/macos-13.vars
> rename to ci/cirrus/macos-15.vars
> diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
> index 214119b902..6f78ba2e89 100644
> --- a/ci/gitlab/builds.yml
> +++ b/ci/gitlab/builds.yml
> @@ -624,22 +624,6 @@ x86_64-freebsd-14:
> UPGRADE_COMMAND: pkg upgrade -y
>
>
> -aarch64-macos-13:
> - extends: .cirrus_build_job
> - needs: []
> - allow_failure: false
> - variables:
> - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest
> - CIRRUS_VM_IMAGE_SELECTOR: image
> - CIRRUS_VM_INSTANCE_TYPE: macos_instance
> - INSTALL_COMMAND: brew install
> - NAME: macos-13
> - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
> - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
> - UPDATE_COMMAND: brew update
> - UPGRADE_COMMAND: brew upgrade
> -
> -
> aarch64-macos-14:
> extends: .cirrus_build_job
> needs: []
> @@ -654,3 +638,19 @@ aarch64-macos-14:
> PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
> UPDATE_COMMAND: brew update
> UPGRADE_COMMAND: brew upgrade
> +
> +
> +aarch64-macos-15:
> + extends: .cirrus_build_job
> + needs: []
> + allow_failure: false
> + variables:
> + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest
I think we screwed up libvirt-ci, as sonoma is 14, sequoia is 15
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
