From nobody Sat Feb 7 11:17:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1728992086836394.3136558271084; Tue, 15 Oct 2024 04:34:46 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C24E711C; Tue, 15 Oct 2024 07:34:45 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A5328186F; Tue, 15 Oct 2024 07:23:02 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DCB1613A3; Tue, 15 Oct 2024 07:22:59 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C485A1805 for ; Tue, 15 Oct 2024 07:19:38 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-411-NzuisSsoOYWhc4JeaRd6Tg-1; Tue, 15 Oct 2024 07:19:37 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 604F11955D80 for ; Tue, 15 Oct 2024 11:19:36 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.118]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6ED1E300019D; Tue, 15 Oct 2024 11:19:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: *** X-Spam-Status: No, score=3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728991178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7hMkf66ndqrKpJ+c0O85A8VF6h3/FZu/iWlGhWEN2+c=; b=A/B+mueC6+63nMCAeVi43ESL7evv9+4A3vN/O4BBjptOZ6Qlz+svUdf6gELQ4iDkwt2p4+ MGr0w6AK9G1+tGaDC5HDXDo1HxG9jgAu0xkvMJ4Af/UMNp8jGhXHMUq4KTTiOxCvmnyx3Z PeaTHhbI5DBSX9UZcVSbqy2noSuX/yY= X-MC-Unique: NzuisSsoOYWhc4JeaRd6Tg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 5/5] ci: update macOS versions under test Date: Tue, 15 Oct 2024 12:19:24 +0100 Message-ID: <20241015111924.212483-6-berrange@redhat.com> In-Reply-To: <20241015111924.212483-1-berrange@redhat.com> References: <20241015111924.212483-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WOLDJ3PK2H5NJ2EEL7Q73Q3KOL3L7RKB X-Message-ID-Hash: WOLDJ3PK2H5NJ2EEL7Q73Q3KOL3L7RKB X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1728992087359116600 Content-Type: text/plain; charset="utf-8" Cirrus CI has stoppped offering multiple versions of macOS images. There is now only 1 single image, but with multiple XCode versions pre-installed, selectable using the 'xcodes' app: $ xcodes list | grep Installed 15.2 (15C500b) (Installed) 15.3 (15E204a) (Installed) 15.4 (15F31d) (Installed, Selected) 16.0 (16A242d) (Installed) $ clang -v Apple clang version 15.0.0 (clang-1500.3.9.4) Target: arm64-apple-darwin23.6.0 Thread model: posix InstalledDir: /Applications/Xcode_15.4.app/Contents/Developer/Toolchain= s/XcodeDefault.xctoolchain/usr/bin $ xcodes select 16.0 xcodes requires superuser privileges to select an Xcode macOS User Password: Selected /Applications/Xcode_16.app/Contents/Developer $ clang -v Apple clang version 16.0.0 (clang-1600.0.26.3) Target: arm64-apple-darwin23.6.0 Thread model: posix InstalledDir: /Applications/Xcode_16.app/Contents/Developer/Toolchains/= XcodeDefault.xctoolchain/usr/bin Any Cirrus CI jobs using an unsupported macOS image name will get forcably changed at runtime to bot the only permitted image, currently sonoma. IOW, our attempts to test multiple versions were not doing anything useful, as evidenced by this message shown in the Cirrus CI web pages for job tasks: "Only ghcr.io/cirruslabs/macos-runner:sonoma is allowed. Automatically upgraded." Replace (failed) testing of multiple macOS versions, with testing of multiple XCode versions - 15.4 and 16.0 Signed-off-by: Daniel P. Berrang=C3=A9 --- ci/cirrus/build.yml | 2 ++ ci/cirrus/macos-13.vars | 16 ---------------- ci/gitlab/builds.yml | 12 +++++++----- ci/manifest.yml | 9 +++++---- 4 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 ci/cirrus/macos-13.vars diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index c0ac05f4d9..110d426aad 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -10,6 +10,7 @@ env: PKG_CONFIG_PATH: "@PKG_CONFIG_PATH@" PYTHON: "@PYTHON@" MAKE: "@MAKE@" + XCODE: "@XCODE@" VIR_TEST_VERBOSE: "1" VIR_TEST_DEBUG: "1" =20 @@ -24,6 +25,7 @@ build_task: - git fetch origin "${CI_MERGE_REQUEST_REF_PATH:-$CI_COMMIT_REF_NAME}" - git reset --hard "$CI_COMMIT_SHA" build_script: + - if test -n "$XCODE"; then xcodes select "$XCODE"; fi - if test "$(uname)" =3D "Darwin"; then meson setup build --optimizati= on 0; else meson setup build; fi - meson dist -C build --no-tests - meson compile -C build diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-13.vars deleted file mode 100644 index d23fe3cd47..0000000000 --- a/ci/cirrus/macos-13.vars +++ /dev/null @@ -1,16 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -CCACHE=3D'/opt/homebrew/bin/ccache' -CPAN_PKGS=3D'' -CROSS_PKGS=3D'' -MAKE=3D'/opt/homebrew/bin/gmake' -NINJA=3D'/opt/homebrew/bin/ninja' -PACKAGING_COMMAND=3D'brew' -PIP3=3D'/opt/homebrew/bin/pip3' -PKGS=3D'augeas bash-completion black ccache codespell cppi curl diffutils = docutils flake8 gettext git glib gnu-sed gnutls grep json-c libiscsi libpca= p libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 q= emu readline' -PYPI_PKGS=3D'pytest' -PYTHON=3D'/opt/homebrew/bin/python3' diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 214119b902..f9685e542d 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -624,28 +624,29 @@ x86_64-freebsd-14: UPGRADE_COMMAND: pkg upgrade -y =20 =20 -aarch64-macos-13: +aarch64-macos-14-xcode-15-4: extends: .cirrus_build_job needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_INSTANCE_TYPE: macos_instance INSTALL_COMMAND: brew install - NAME: macos-13 + 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/libp= cap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurs= es/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig UPDATE_COMMAND: brew update UPGRADE_COMMAND: brew upgrade + XCODE: 15.4 =20 =20 -aarch64-macos-14: +aarch64-macos-14-xcode-16-0: extends: .cirrus_build_job needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_INSTANCE_TYPE: macos_instance INSTALL_COMMAND: brew install @@ -654,3 +655,4 @@ aarch64-macos-14: PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libp= cap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurs= es/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig UPDATE_COMMAND: brew update UPGRADE_COMMAND: brew upgrade + XCODE: 16 diff --git a/ci/manifest.yml b/ci/manifest.yml index 647510ed2f..6f8263f242 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -203,19 +203,20 @@ targets: variables: RPM: skip =20 - macos-13: + macos-14: jobs: - arch: aarch64 + suffix: -xcode-15-4 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/op= t/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt= /ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - - macos-14: - jobs: + XCODE: 15.4 - arch: aarch64 + suffix: -xcode-16-0 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/op= t/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt= /ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + XCODE: "16.0" =20 ubuntu-2204: jobs: --=20 2.46.0