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
+ CIRRUS_VM_IMAGE_SELECTOR: image
+ CIRRUS_VM_INSTANCE_TYPE: macos_instance
+ INSTALL_COMMAND: brew install
+ NAME: macos-15
+ 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
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 647510ed2f..3c2366380c 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -203,13 +203,6 @@ targets:
variables:
RPM: skip
- macos-13:
- jobs:
- - arch: aarch64
- variables:
- 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
-
macos-14:
jobs:
- arch: aarch64
@@ -217,6 +210,13 @@ targets:
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
+ macos-15:
+ jobs:
+ - arch: aarch64
+ variables:
+ 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
+
ubuntu-2204:
jobs:
- arch: x86_64
--
2.44.2
