From cff934754ad0cf682b8d5139547cbc4ba4e0690f Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Mon, 6 Nov 2023 11:36:15 +0100 Subject: [PATCH] ci: Add macOS 14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrangé --- ci/cirrus/macos-14.vars | 16 ++++++++++++++++ ci/gitlab/builds.yml | 16 ++++++++++++++++ ci/manifest.yml | 7 +++++++ 3 files changed, 39 insertions(+) create mode 100644 ci/cirrus/macos-14.vars diff --git a/ci/cirrus/macos-14.vars b/ci/cirrus/macos-14.vars new file mode 100644 index 0000000000..33fc86e1f5 --- /dev/null +++ b/ci/cirrus/macos-14.vars @@ -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' diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 51b57c4ea5..f83f6c7f68 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -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 diff --git a/ci/manifest.yml b/ci/manifest.yml index a40f448162..5dd00985b5 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -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