travis: Deduplicate build instructions

All information, except for osx_image image, is identical between
the two jobs so we can avoid repeating it.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Andrea Bolognani 2020-04-10 10:16:47 +02:00
parent 483dd223b5
commit 31730aff3e

View File

@ -1,5 +1,7 @@
sudo: required sudo: required
language: generic language: c
compiler: clang
os: osx
branches: branches:
except: except:
@ -18,36 +20,23 @@ addons:
matrix: matrix:
include: include:
- compiler: clang - osx_image: xcode11.3
language: c - osx_image: xcode10.3
os: osx
osx_image: xcode10.3 env:
env: global:
- PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH" - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH"
- PKG_CONFIG_PATH="/usr/local/opt/libxml2/lib/pkgconfig" - PKG_CONFIG_PATH="/usr/local/opt/libxml2/lib/pkgconfig"
before_script:
# Hack to blow away py2 before_script:
- brew link --overwrite python # Hack to blow away py2
script: - brew link --overwrite python
# We can't run 'distcheck' or 'syntax-check' because they fail on
# macOS, but doing 'install' and 'dist' gives us some useful coverage script:
- mkdir build && cd build # We can't run 'distcheck' or 'syntax-check' because they fail on
- ../autogen.sh --prefix=$(pwd)/install-root && make -j3 && make -j3 install && make -j3 dist # macOS, but doing 'install' and 'dist' gives us some useful coverage
- compiler: clang - mkdir build && cd build
language: c - ../autogen.sh --prefix=$(pwd)/install-root && make -j3 && make -j3 install && make -j3 dist
os: osx
osx_image: xcode11.3
env:
- PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH"
- PKG_CONFIG_PATH="/usr/local/opt/libxml2/lib/pkgconfig"
before_script:
# Hack to blow away py2
- brew link --overwrite python
script:
# We can't run 'distcheck' or 'syntax-check' because they fail on
# macOS, but doing 'install' and 'dist' gives us some useful coverage
- mkdir build && cd build
- ../autogen.sh --prefix=$(pwd)/install-root && make -j3 && make -j3 install && make -j3 dist
git: git:
submodules: true submodules: true