From nobody Sat Dec 21 14:04:21 2024 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 1726579594305952.1047694598111; Tue, 17 Sep 2024 06:26:34 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2D1F81A58; Tue, 17 Sep 2024 09:26:33 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 025251A1A; Tue, 17 Sep 2024 09:26:13 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BD7AB19F0; Tue, 17 Sep 2024 09:26:10 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 202B418A3 for ; Tue, 17 Sep 2024 09:26:10 -0400 (EDT) Received: from mx-prod-mc-02.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-438-0zY1T66EPjaUJ3e0usJntA-1; Tue, 17 Sep 2024 09:26:07 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2A4F61937266 for ; Tue, 17 Sep 2024 13:26:06 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5B3781956086 for ; Tue, 17 Sep 2024 13:26:05 +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=-0.5 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,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726579569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ku+G2s8LN/ONE8juocx3OwlWU+AtXCk/28DL5M2BxKI=; b=H8LJFPEUUuBv8KtHj3O2HZW0+Z6ddIBBKZDwdtJV8ZpcDB61lXralInCY0rdNyQJF6duMC wDARz2Wt5Q08dQqF61xL7Vj2jXofnNBgcN54Ve+Gd13w3RhgSGN9vDjqFX41U6mmY0tsCN h1HpbOublquadgLGHZpqSmIXeX+QIro= X-MC-Unique: 0zY1T66EPjaUJ3e0usJntA-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH] ci: Switch from macOS 13 to macOS 15 Date: Tue, 17 Sep 2024 15:26:02 +0200 Message-ID: <223dd122b02ab9a4c686f85aeafc69dac069378a.1726579562.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JKHGATBYZM7ZWJRPVQEJ5PGJLPO73ODY X-Message-ID-Hash: JKHGATBYZM7ZWJRPVQEJ5PGJLPO73ODY X-MailFrom: mprivozn@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: 1726579594683116600 Content-Type: text/plain; charset="utf-8"; x-default="true" libvirt-ci added macOS 15 so let's introduce it and while at it drop macOS 13. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- ci/cirrus/{macos-13.vars =3D> 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 =3D> 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 =20 =20 -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/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 - - 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/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 + + +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/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 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 =20 - 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/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: - 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/op= t/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt= /ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig =20 + 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/op= t/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 --=20 2.44.2