From c05927b911c113e547a46d90f61ae6a806a44194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 27 Mar 2019 10:53:05 +0000 Subject: [PATCH] travis: put macOS script inline in the macOS matrix entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that we don't have separate scripts defined for native and mingw builds, there is no point having one for macOS. It can just be inlined at the one place it is needed. Reviewed-by: Andrea Bolognani Signed-off-by: Daniel P. Berrangé --- .travis.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cf356a8b1..b510c81083 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,22 +50,13 @@ matrix: env: - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH" 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: - # 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