]> xenbits.xensource.com Git - libvirt.git/commitdiff
ci: Add macOS 14
authorAndrea Bolognani <abologna@redhat.com>
Mon, 6 Nov 2023 10:36:15 +0000 (11:36 +0100)
committerAndrea Bolognani <abologna@redhat.com>
Mon, 6 Nov 2023 15:48:56 +0000 (16:48 +0100)
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
ci/cirrus/macos-14.vars [new file with mode: 0644]
ci/gitlab/builds.yml
ci/manifest.yml

diff --git a/ci/cirrus/macos-14.vars b/ci/cirrus/macos-14.vars
new file mode 100644 (file)
index 0000000..33fc86e
--- /dev/null
@@ -0,0 +1,16 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+CCACHE='/opt/homebrew/bin/ccache'
+CPAN_PKGS=''
+CROSS_PKGS=''
+MAKE='/opt/homebrew/bin/gmake'
+NINJA='/opt/homebrew/bin/ninja'
+PACKAGING_COMMAND='brew'
+PIP3='/opt/homebrew/bin/pip3'
+PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline scrub yajl'
+PYPI_PKGS=''
+PYTHON='/opt/homebrew/bin/python3'
index 51b57c4ea521f52f19a061609adcc979ab63b014..f83f6c7f68475884831fe9fa11063a57ce8a681b 100644 (file)
@@ -1086,3 +1086,19 @@ aarch64-macos-13:
     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: []
+  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-14
+    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
index a40f448162f77c9ae5bb8c72f79a91b5d3c7ba1c..5dd00985b5d57670b96d6981f6ac2975cb4d35d5 100644 (file)
@@ -225,6 +225,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-14:
+    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-2004:
     jobs:
       - arch: x86_64