diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-03 07:35:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-03 07:35:49 (GMT) |
| commit | 04270bbbcf31702aaab64f0c01e2109bb82e7cad (patch) | |
| tree | f7f623e0ae7a5abe8562c6c5b1d43b2a3ee6ac50 | |
| parent | 8cc9a5a6c472395264ef81e6a3c3994a42442280 (diff) | |
| parent | e60e69eac9658b020c0e5cf4de6db27157c5f55d (diff) | |
| download | tcl-04270bbbcf31702aaab64f0c01e2109bb82e7cad.zip tcl-04270bbbcf31702aaab64f0c01e2109bb82e7cad.tar.gz tcl-04270bbbcf31702aaab64f0c01e2109bb82e7cad.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | .travis.yml | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 98ef72d..373145b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,10 @@ addons: - gcc-mingw-w64-i686 - gcc-mingw-w64-x86-64 - gcc-multilib + homebrew: + packages: + - libtommath + update: true matrix: include: # Testing on Linux with various compilers @@ -135,11 +139,6 @@ matrix: - BUILD_DIR=unix - CFGOPT="--enable-symbols=mem" # Testing on Mac, various styles - - name: "macOS/Xcode 11.3/Shared/Unix-like" - os: osx - osx_image: xcode11.3 - env: - - BUILD_DIR=unix - name: "macOS/Xcode 11.3/Shared" os: osx osx_image: xcode11.3 @@ -150,10 +149,12 @@ matrix: - make all # The styles=develop avoids some weird problems on OSX - make test styles=develop - addons: - homebrew: - packages: - - libtommath + - name: "macOS/Xcode 11.3/Shared/Unix-like" + os: osx + osx_image: xcode11.3 + env: + - BUILD_DIR=unix +# Older MacOS versions - name: "macOS/Xcode 11/Shared" os: osx osx_image: xcode11 @@ -174,7 +175,7 @@ matrix: - libtommath - name: "macOS/Xcode 9/Shared" os: osx - osx_image: xcode9 + osx_image: xcode9.2 env: - BUILD_DIR=macosx install: [] @@ -185,7 +186,7 @@ matrix: - libtommath - name: "macOS/Xcode 8/Shared" os: osx - osx_image: xcode8 + osx_image: xcode8.3 env: - BUILD_DIR=macosx install: [] @@ -438,13 +439,6 @@ matrix: - CFGOPT="--enable-symbols=mem" before_install: *makepreinst before_install: - - |- - case $TRAVIS_OS_NAME in - osx) - brew update - brew install libtommath - ;; - esac - cd ${BUILD_DIR} install: - ./configure ${CFGOPT} --prefix=$HOME || (cat config.log && exit 1) |