summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2018-11-12 09:49:24 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2018-11-12 09:49:24 (GMT)
commitfc38a30572b56187498c4cc8f3721a26e919cdcf (patch)
treefefb156940d93d999201f0efdcdad12e377d0c05
parent13f704914ae916a8e298edfa0d730482b1c74d89 (diff)
downloadtcl-fc38a30572b56187498c4cc8f3721a26e919cdcf.zip
tcl-fc38a30572b56187498c4cc8f3721a26e919cdcf.tar.gz
tcl-fc38a30572b56187498c4cc8f3721a26e919cdcf.tar.bz2
Cleaner way of writing environment variables
-rw-r--r--.travis.yml23
1 files changed, 16 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index a2a59fc..947e858 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,8 @@ matrix:
dist: trusty
compiler: clang
env:
- - CFGOPT=--disable-shared BUILD_DIR=unix
+ - CFGOPT=--disable-shared
+ - BUILD_DIR=unix
- os: linux
dist: trusty
compiler: gcc
@@ -22,7 +23,8 @@ matrix:
dist: trusty
compiler: gcc
env:
- - CFGOPT=--disable-shared BUILD_DIR=unix
+ - CFGOPT=--disable-shared
+ - BUILD_DIR=unix
- os: linux
dist: trusty
compiler: gcc-4.9
@@ -74,15 +76,18 @@ matrix:
- os: osx
osx_image: xcode8
env:
- - BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1
+ - BUILD_DIR=macosx
+ - NO_DIRECT_CONFIGURE=1
- os: osx
osx_image: xcode9
env:
- - BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1
+ - BUILD_DIR=macosx
+ - NO_DIRECT_CONFIGURE=1
- os: osx
osx_image: xcode10
env:
- - BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1
+ - BUILD_DIR=macosx
+ - NO_DIRECT_CONFIGURE=1
### C builds not currently supported on Windows instances
# - os: windows
# env:
@@ -102,7 +107,9 @@ matrix:
- gcc-multilib
- wine
env:
- - BUILD_DIR=win CFGOPT=--host=i686-w64-mingw32 NO_DIRECT_TEST=1
+ - BUILD_DIR=win
+ - CFGOPT=--host=i686-w64-mingw32
+ - NO_DIRECT_TEST=1
# Test with mingw-w64 (64 bit)
- os: linux
dist: trusty
@@ -116,7 +123,9 @@ matrix:
- gcc-mingw-w64
- wine
env:
- - BUILD_DIR=win CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" NO_DIRECT_TEST=1
+ - BUILD_DIR=win
+ - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit"
+ - NO_DIRECT_TEST=1
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get stable; fi