From nobody Sat Apr 27 19:48:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521120901618425.3385839655572; Thu, 15 Mar 2018 06:35:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1019B7FEB3; Thu, 15 Mar 2018 13:35:00 +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 CB9065D70A; Thu, 15 Mar 2018 13:34:59 +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 93CF64CA9D; Thu, 15 Mar 2018 13:34:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2FDY7QL004899 for ; Thu, 15 Mar 2018 09:34:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 85019AFD72; Thu, 15 Mar 2018 13:34:07 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE062C1233; Thu, 15 Mar 2018 13:34:06 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 15 Mar 2018 13:33:57 +0000 Message-Id: <20180315133358.11420-2-berrange@redhat.com> In-Reply-To: <20180315133358.11420-1-berrange@redhat.com> References: <20180315133358.11420-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Andrea Bolognani Subject: [libvirt] [PATCH 1/2] travis: move macOS before_install tasks into osx matrix entry 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 15 Mar 2018 13:35:00 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The list of commands we're running for the before_install task is rather large. We have it all on one line because we're wrapping it all in a test against TRAVIS_OS_NAME env variable. By moving it into the osx matrix entry we can remove the need for the conditional shell test. This lets us put each command on a separate line making the steps clear to understand. Fortunately the 'before_install' task does not have the crazy behaviour whereby travis ignores errors and runs all commands regardless, like the 'script' task does. The first command failing will cause an immediate stop with error status. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Andrea Bolognani --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79f30f3090..9801981eca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,11 @@ matrix: - DISTCHECK_CONFIGURE_FLAGS=3D"--with-init-script=3Dsystemd" - compiler: clang os: osx + before_install: + - brew update + - brew upgrade + - brew install rpcgen yajl xz + - brew link --force python@2 script: # We can't run make distcheck/syntax-check because they # fail on macOS, but doing 'install' and 'dist' gives us @@ -99,9 +104,6 @@ env: - PATH=3D"/usr/local/opt/gettext/bin:/usr/local/opt/rpcgen/bin:$PATH" - VIR_TEST_DEBUG=3D1 =20 -before_install: - - if [ "$TRAVIS_OS_NAME" =3D=3D "osx" ]; then brew update && brew upgrad= e && brew install rpcgen yajl xz && brew link --force python@2; fi - before_script: - ./autogen.sh --prefix=3D$(pwd)/install-root =20 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 19:48:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521120905197575.6748049187577; Thu, 15 Mar 2018 06:35:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7F488C206AC0; Thu, 15 Mar 2018 13:35:03 +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 4F7375D755; Thu, 15 Mar 2018 13:35:03 +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 0CFAE4CA9D; Thu, 15 Mar 2018 13:35:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2FDY9Ef004916 for ; Thu, 15 Mar 2018 09:34:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 228DEC1233; Thu, 15 Mar 2018 13:34:09 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84CADAFD72; Thu, 15 Mar 2018 13:34:08 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 15 Mar 2018 13:33:58 +0000 Message-Id: <20180315133358.11420-3-berrange@redhat.com> In-Reply-To: <20180315133358.11420-1-berrange@redhat.com> References: <20180315133358.11420-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Andrea Bolognani Subject: [libvirt] [PATCH 2/2] travis: unlink python package before upgrading brew packages 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 15 Mar 2018 13:35:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The 'brew upgrade' command is pulling in the python2 package which promptly fails due to clashing symlinks installed by the new python package (which is python3 based): =3D=3D> Pouring python@2-2.7.14_3.sierra.bottle.tar.gz Error: The `brew link` step did not complete successfully The formula built, but is not symlinked into /usr/local Could not symlink bin/2to3-2 Target /usr/local/bin/2to3-2 is a symlink belonging to python. You can unlink it: brew unlink python To force the link and overwrite all conflicting files: brew link --overwrite python@2 To list all files that would be deleted: brew link --overwrite --dry-run python@2 By running 'brew unlink python' we can get rid of the python3 links that we didn't want in the first place and avoid this error. This is the working fix for what we previously attempted todo in: commit c9c9fc90ce77ac4a3079c99f42b621937b464700 Author: Daniel P. Berrang=C3=A9 Date: Mon Mar 5 10:13:12 2018 +0000 travis: force install of python2 into $PATH on macOS Signed-off-by: Daniel P. Berrang=C3=A9 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9801981eca..d1f09f9cad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,9 @@ matrix: os: osx before_install: - brew update + - brew unlink python - brew upgrade - brew install rpcgen yajl xz - - brew link --force python@2 script: # We can't run make distcheck/syntax-check because they # fail on macOS, but doing 'install' and 'dist' gives us --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list