From nobody Tue Apr 30 17:11:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613409315; cv=none; d=zohomail.com; s=zohoarc; b=kVDOS3F0+kdzPzetghF3uvw73ByDyiINyJLdPePoGt2jLfA4+pN8J4/xgJBb6jtkQc9/YpFQuqoY5fnBNBTh1VC8YdhPS1Uk9kBlTv8DT3sgQhNzQdk2U0HHrEIx1D41pYqtK5XAxwpWXq9ztEalH3Ng3783SLabaRx4LQvNlew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613409315; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NRbiKR3n7pXqfurzQKJ5Mz8CvyfSJII8xeLzdunqeVE=; b=cUbeE+E6zfd7w/X2D4sPC5hFjH6q+0ma+6HQV5mN4SPVfO8zznbqB1+CYWhj1iJtQjq84qp3YNB6W5UTu8UlD95j6XFRNdQ1gEoHQQ2Rd+WDNMH8ki9DiTTBb0gJYEomD1vdoDYuAcWXnLJXpnP2t0XDqMdsEE1bwc32U65vSx8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1613409315110212.04037993040947; Mon, 15 Feb 2021 09:15:15 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-93-BJUUz4HkMF297p-IOTjJVA-1; Mon, 15 Feb 2021 12:15:11 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5DC8E10CE784; Mon, 15 Feb 2021 17:15:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E03D4679F2; Mon, 15 Feb 2021 17:15:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4E51E57DFC; Mon, 15 Feb 2021 17:15:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11FHF2e3032444 for ; Mon, 15 Feb 2021 12:15:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 215902B42E; Mon, 15 Feb 2021 17:15:02 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.97]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 468462B399 for ; Mon, 15 Feb 2021 17:15:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613409314; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NRbiKR3n7pXqfurzQKJ5Mz8CvyfSJII8xeLzdunqeVE=; b=BvZams0YSvYXEd00FoGlAAc8ASHC4wdSt2Dk2/45mbDmbzkZ5bs0qhvLl05PxjoER021pp kkxofMwl8XpgvIE84PfHncLlzhEl8Jetjs6tCORMnCtDizuOElZmDpki0bzqqms65ZBpfP t1a9uYpYsFi/3IQRcVrCoJxNVZRUCdQ= X-MC-Unique: BJUUz4HkMF297p-IOTjJVA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] ci: Update package list on Cirrus CI Date: Mon, 15 Feb 2021 18:14:52 +0100 Message-Id: <20210215171453.71350-2-abologna@redhat.com> In-Reply-To: <20210215171453.71350-1-abologna@redhat.com> References: <20210215171453.71350-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" While pkgng on FreeBSD updates the package list automatically when it's run, homebrew on macOS doesn't do the same thing, which can result in stale packages being installed. Explicitly call 'brew update' before 'brew install' to avoid that scenario. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- .gitlab-ci.yml | 4 ++++ ci/cirrus/build.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4563bccdf1..0f609cd8c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,6 +95,7 @@ stages: -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g" + -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g" -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g" -e "s|[@]PATH@|$PATH_EXTRA${PATH_EXTRA:+:}\$PATH|g" -e "s|[@]PKG_CONFIG_PATH@|$PKG_CONFIG_PATH|g" @@ -410,6 +411,7 @@ x64-freebsd-11-build: CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-11-4 + UPDATE_COMMAND: pkg update INSTALL_COMMAND: pkg install -y =20 x64-freebsd-12-build: @@ -419,6 +421,7 @@ x64-freebsd-12-build: CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-12-2 + UPDATE_COMMAND: pkg update INSTALL_COMMAND: pkg install -y =20 x64-macos-1015-build: @@ -428,6 +431,7 @@ x64-macos-1015-build: CIRRUS_VM_INSTANCE_TYPE: osx_instance CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_IMAGE_NAME: catalina-base + UPDATE_COMMAND: brew update INSTALL_COMMAND: brew install PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/= usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/= 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 diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index 3ca88b265b..a6b13b947c 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -12,6 +12,7 @@ env: =20 build_task: install_script: + - @UPDATE_COMMAND@ - @INSTALL_COMMAND@ @PKGS@ - if test -n "@PYPI_PKGS@" ; then @PIP3@ install @PYPI_PKGS@ ; fi clone_script: --=20 2.26.2 From nobody Tue Apr 30 17:11:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1613409313933638.8348355939288; Mon, 15 Feb 2021 09:15:13 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-594-AEQuS2X_Pi2AhH2egqrgEg-1; Mon, 15 Feb 2021 12:15:10 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60C92C73A3; Mon, 15 Feb 2021 17:15:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F2C7D710DB; Mon, 15 Feb 2021 17:15:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 55E6018095CE; Mon, 15 Feb 2021 17:15:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11FHF3fw032467 for ; Mon, 15 Feb 2021 12:15:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6BD5060CEF; Mon, 15 Feb 2021 17:15:03 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.97]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AFEC5614ED for ; Mon, 15 Feb 2021 17:15:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613409312; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=4EvjIysG2LdqQYuTRs0wjvj89XipTwn9uABBOUepGR8=; b=ek8lA0nWUjF1AzZYEyol398PPK5OY8wGKsUQ7UKEOoKFG2VWBR3QwRwldgc5c+OdN0bgTF 5ZA90A/UnerifZ9bNAmDuPTKJECwL4FAK/8mYpOOy1Jo7ijH740w0D9l9brpWCBBF5xXtn av+II16SEupKm3BUJ0/hQaYFE42D6/I= X-MC-Unique: AEQuS2X_Pi2AhH2egqrgEg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] ci: Build on macOS 11 instead of macOS 10.15 Date: Mon, 15 Feb 2021 18:14:53 +0100 Message-Id: <20210215171453.71350-3-abologna@redhat.com> In-Reply-To: <20210215171453.71350-1-abologna@redhat.com> References: <20210215171453.71350-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" macOS builder capacity on Cirrus CI is quite limited, and so we can't afford to keep the old build job around after adding the new one like we do for FreeBSD. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- .gitlab-ci.yml | 6 +++--- ci/cirrus/{macos-1015.vars =3D> macos-11.vars} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename ci/cirrus/{macos-1015.vars =3D> macos-11.vars} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f609cd8c7..81a4e80fd8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -424,13 +424,13 @@ x64-freebsd-12-build: UPDATE_COMMAND: pkg update INSTALL_COMMAND: pkg install -y =20 -x64-macos-1015-build: +x64-macos-11-build: extends: .cirrus_build_job variables: - NAME: macos-1015 + NAME: macos-11 CIRRUS_VM_INSTANCE_TYPE: osx_instance CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: catalina-base + CIRRUS_VM_IMAGE_NAME: big-sur-base UPDATE_COMMAND: brew update INSTALL_COMMAND: brew install PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/= usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/= bin diff --git a/ci/cirrus/macos-1015.vars b/ci/cirrus/macos-11.vars similarity index 100% rename from ci/cirrus/macos-1015.vars rename to ci/cirrus/macos-11.vars --=20 2.26.2