From nobody Wed May 14 02:10:01 2025 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 152838689903216.385250099880636; Thu, 7 Jun 2018 08:54:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 428A830820CF; Thu, 7 Jun 2018 15:54:57 +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 B3687308BDA2; Thu, 7 Jun 2018 15:54:56 +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 2E76E4CA80; Thu, 7 Jun 2018 15:54:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w57Fsp6H018129 for ; Thu, 7 Jun 2018 11:54:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id AB41E201E903; Thu, 7 Jun 2018 15:54:51 +0000 (UTC) Received: from inaba.usersys.redhat.com (ovpn-204-79.brq.redhat.com [10.40.204.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E786201E8ED for ; Thu, 7 Jun 2018 15:54:51 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Jun 2018 17:54:42 +0200 Message-Id: <20180607155443.4295-4-abologna@redhat.com> In-Reply-To: <20180607155443.4295-1-abologna@redhat.com> References: <20180607155443.4295-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/4] travis: Introduce MACOS_CMD 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 07 Jun 2018 15:54:57 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It mirrors the existing DOCKER_CMD, both in how it's defined as part of the environment and how it's called by passing it directly to the shell. In addition to making the configuration more consistent, this also allows us to move from having the macOS build script divided into four steps, some of which have slightly different semantics and the relationship between which is not immediately obvious without consulting the documentation, to a single straightforward shell invocation. Signed-off-by: Andrea Bolognani --- .travis.yml | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4afaca313b..ec45d78303 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,20 +22,8 @@ matrix: os: osx env: - PATH=3D"/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec= :/usr/local/opt/rpcgen/bin:$PATH" - before_install: - - brew update - - brew install ccache rpcgen xz yajl - before_script: - - ./autogen.sh --prefix=3D$(pwd)/install-root script: - # We can't run make distcheck/syntax-check because they - # fail on macOS, but doing 'install' and 'dist' gives us - # some useful coverage - - make -j3 && make -j3 install && make -j3 dist - after_failure: - - echo '=3D=3D=3D LOG FILE(S) START =3D=3D=3D' - - find -name test-suite.log | xargs cat - - echo '=3D=3D=3D LOG FILE(S) END =3D=3D=3D' + /bin/sh -xc "$MACOS_CMD" =20 script: - docker run @@ -68,6 +56,22 @@ env: exit 1 ) " + # We can't run 'distcheck' or 'syntax-check' because they fail on + # macOS, but doing 'install' and 'dist' gives us some useful coverage + - MACOS_CMD=3D" + brew update && + brew install ccache rpcgen xz yajl && + ./autogen.sh --prefix=3D\$(pwd)/install-root && + make -j3 && + make -j3 install && + make -j3 dist || + ( + echo '=3D=3D=3D LOG FILE(S) START =3D=3D=3D' + find -name test-suite.log | xargs cat + echo '=3D=3D=3D LOG FILE(S) END =3D=3D=3D' + exit 1 + ) + " # Please keep this list sorted alphabetically - PACKAGES=3D" augeas-tools --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list