[libvirt] [PATCH v3 6/6] travis: put macOS script inline in the macOS matrix entry

Daniel P. Berrangé berrange at redhat.com
Wed Mar 27 17:10:38 UTC 2019


Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 .travis.yml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 027fa0c67a..af17dc6276 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,23 +48,15 @@ matrix:
       os: osx
       env:
         - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH"
+        - VIR_TEST_DEBUG=1
       script:
-        /bin/sh -xc "$MACOS_CMD"
+        # We can't run 'distcheck' or 'syntax-check' because they fail on
+        # macOS, but doing 'install' and 'dist' gives us some useful coverage
+        - ./autogen.sh --prefix=$(pwd)/install-root && make -j3 && make -j3 install && make -j3 dist
 
 git:
   submodules: true
 
-env:
-  global:
-    - VIR_TEST_DEBUG=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="
-        ./autogen.sh --prefix=\$(pwd)/install-root &&
-        make -j3 &&
-        make -j3 install &&
-        make -j3 dist"
-
 notifications:
   irc:
     # The channel name "irc.oftc.net#virt" is encrypted against libvirt/libvirt
-- 
2.20.1




More information about the libvir-list mailing list