diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2018-11-07 19:22:20 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2018-11-07 19:22:20 (GMT) |
| commit | 155f409a383ca0411146efb82246e52ec12270fe (patch) | |
| tree | 91709248e592306fc7d1024996a46faa8dd4e766 /.travis.yml | |
| parent | 20c06fad809fc59205d229817c39fcf8ea1e11d0 (diff) | |
| download | tcl-155f409a383ca0411146efb82246e52ec12270fe.zip tcl-155f409a383ca0411146efb82246e52ec12270fe.tar.gz tcl-155f409a383ca0411146efb82246e52ec12270fe.tar.bz2 | |
Merge the Travis build rules more properly
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 160 |
1 files changed, 27 insertions, 133 deletions
diff --git a/.travis.yml b/.travis.yml index 7cf6989..230885d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,30 @@ -dist: trusty sudo: false language: c + matrix: include: - os: linux + dist: trusty compiler: clang env: - - MATRIX_EVAL="" BUILD_DIR=unix + - CFGOPT=--enable-shared BUILD_DIR=unix MATRIX_EVAL="" - os: linux + dist: trusty compiler: clang env: - - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared + - CFGOPT=--disable-shared BUILD_DIR=unix MATRIX_EVAL="" - os: linux + dist: trusty compiler: gcc env: - - MATRIX_EVAL="" BUILD_DIR=unix + - CFGOPT=--enable-shared BUILD_DIR=unix MATRIX_EVAL="" - os: linux + dist: trusty compiler: gcc env: - - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared + - CFGOPT=--disable-shared BUILD_DIR=unix MATRIX_EVAL="" - os: linux + dist: trusty compiler: gcc addons: apt: @@ -28,8 +33,9 @@ matrix: packages: - g++-4.9 env: - - MATRIX_EVAL="CC=gcc-4.9" BUILD_DIR=unix + - CC=gcc-4.9 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-4.9" - os: linux + dist: trusty compiler: gcc addons: apt: @@ -38,8 +44,9 @@ matrix: packages: - g++-5 env: - - MATRIX_EVAL="CC=gcc-5" BUILD_DIR=unix + - CC=gcc-5 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-5" - os: linux + dist: trusty compiler: gcc addons: apt: @@ -48,8 +55,9 @@ matrix: packages: - g++-6 env: - - MATRIX_EVAL="CC=gcc-6" BUILD_DIR=unix + - CC=gcc-6 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-6" - os: linux + dist: trusty compiler: gcc addons: apt: @@ -58,133 +66,31 @@ matrix: packages: - g++-7 env: - - MATRIX_EVAL="CC=gcc-7" BUILD_DIR=unix + - CC=gcc-7 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-7" - os: osx osx_image: xcode8 env: - - MATRIX_EVAL="" BUILD_DIR=unix + - BUILD_DIR=unix MATRIX_EVAL="" - os: osx osx_image: xcode8 env: - - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx MATRIX_EVAL="" NO_DIRECT_CONFIGURE=1 - os: osx osx_image: xcode9 env: - - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx MATRIX_EVAL="" NO_DIRECT_CONFIGURE=1 - os: osx osx_image: xcode10 env: - - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx MATRIX_EVAL="" NO_DIRECT_CONFIGURE=1 ### C builds not currently supported on Windows instances # - os: windows # env: -# - MATRIX_EVAL="" BUILD_DIR=win - -before_install: - - eval "${MATRIX_EVAL}" - - export ERROR_ON_FAILURES=1 - - cd ${BUILD_DIR} -install: - - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT} -script: - - make - - make test -dist: trusty -sudo: false -language: c -matrix: - include: - - os: linux - compiler: clang - env: - - MATRIX_EVAL="" - - BUILD_DIR=unix - - os: linux - compiler: clang - env: - - MATRIX_EVAL="" - - BUILD_DIR=unix - - CFGOPT=--disable-shared - - os: linux - compiler: gcc - env: - - MATRIX_EVAL="" - - BUILD_DIR=unix - - os: linux - compiler: gcc - env: - - MATRIX_EVAL="" - - BUILD_DIR=unix - - CFGOPT=--disable-shared - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.9 - env: - - MATRIX_EVAL="CC=gcc-4.9" - - BUILD_DIR=unix - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-5 - env: - - MATRIX_EVAL="CC=gcc-5" - - BUILD_DIR=unix - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 - env: - - MATRIX_EVAL="CC=gcc-6" - - BUILD_DIR=unix - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-7 - env: - - MATRIX_EVAL="CC=gcc-7" - - BUILD_DIR=unix - - os: osx - osx_image: xcode8 - env: - - MATRIX_EVAL="" - - BUILD_DIR=unix - - os: osx - osx_image: xcode8 - env: - - MATRIX_EVAL="" - - BUILD_DIR=macosx - - NO_DIRECT_CONFIGURE=1 - - os: osx - osx_image: xcode9 - env: - - MATRIX_EVAL="" - - BUILD_DIR=macosx - - NO_DIRECT_CONFIGURE=1 - - os: osx - osx_image: xcode10 - env: - - MATRIX_EVAL="" - - BUILD_DIR=macosx - - NO_DIRECT_CONFIGURE=1 +# - BUILD_DIR=win MATRIX_EVAL="" +### ... so proxy with a Mingw cross-compile # Test with mingw-w64 (32 bit) - os: linux + dist: trusty compiler: i686-w64-mingw32-gcc addons: apt: @@ -196,13 +102,10 @@ matrix: - gcc-multilib - wine env: - - MATRIX_EVAL="" - - BUILD_DIR=win - - CFGOPT=--host=i686-w64-mingw32 - - NO_DIRECT_TEST=1 - + - BUILD_DIR=win MATRIX_EVAL="" CFGOPT=--host=i686-w64-mingw32 NO_DIRECT_TEST=1 # Test with mingw-w64 (64 bit) - os: linux + dist: trusty compiler: x86_64-w64-mingw32-gcc addons: apt: @@ -213,16 +116,7 @@ matrix: - gcc-mingw-w64 - wine env: - - MATRIX_EVAL="" - - BUILD_DIR=win - - CFGOPT=--host=x86_64-w64-mingw32 --enable-64bit - - NO_DIRECT_TEST=1 - -### C builds not currently supported on Windows instances -# - os: windows -# env: -# - MATRIX_EVAL="" -# - BUILD_DIR=win + - BUILD_DIR=win MATRIX_EVAL="" CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" NO_DIRECT_TEST=1 before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get stable; fi |