diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-16 09:24:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-16 09:24:12 (GMT) |
| commit | 9b29b188a419446b6143817cb8b36695c6fa41fa (patch) | |
| tree | 47f15fdc4e5e599073e28764c1157e4bafcb728f | |
| parent | 140064bf12fdf57b87abdbcadb7c8d62b843c309 (diff) | |
| parent | b06a8fa612b12b7e0ed0aa178d66801cce07726e (diff) | |
| download | tcl-9b29b188a419446b6143817cb8b36695c6fa41fa.zip tcl-9b29b188a419446b6143817cb8b36695c6fa41fa.tar.gz tcl-9b29b188a419446b6143817cb8b36695c6fa41fa.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | .travis.yml | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 0a1b943..be5859f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,63 +31,63 @@ matrix: - CFGOPT=--disable-shared - BUILD_DIR=unix # Older versions of GCC... - - name: "Linux/GCC 4.9/Shared" + - name: "Linux/GCC 7/Shared" os: linux dist: xenial - compiler: gcc-4.9 + compiler: gcc-7 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-4.9 + - g++-7 env: - BUILD_DIR=unix - - name: "Linux/GCC 5/Shared" + - name: "Linux/GCC 6/Shared" os: linux dist: xenial - compiler: gcc-5 + compiler: gcc-6 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-5 + - g++-6 env: - BUILD_DIR=unix - - name: "Linux/GCC 6/Shared" + - name: "Linux/GCC 5/Shared" os: linux dist: xenial - compiler: gcc-6 + compiler: gcc-5 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-6 + - g++-5 env: - BUILD_DIR=unix - - name: "Linux/GCC 7/Shared" + - name: "Linux/GCC 4.9/Shared" os: linux dist: xenial - compiler: gcc-7 + compiler: gcc-4.9 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-7 + - g++-4.9 env: - BUILD_DIR=unix # Testing on Mac, various styles - - name: "macOS/Xcode 8/Shared/Unix-like" + - name: "macOS/Xcode 11/Shared/Unix-like" os: osx - osx_image: xcode8 + osx_image: xcode11 env: - BUILD_DIR=unix - - name: "macOS/Xcode 8/Shared/Mac-like" + - name: "macOS/Xcode 11/Shared/Mac-like" os: osx - osx_image: xcode8 + osx_image: xcode11 env: - BUILD_DIR=macosx install: [] @@ -95,6 +95,13 @@ matrix: - make all # The styles=develop avoids some weird problems on OSX - make test styles=develop + - name: "macOS/Xcode 10/Shared/Mac-like" + os: osx + osx_image: xcode10.2 + env: + - BUILD_DIR=macosx + install: [] + script: *mactest - name: "macOS/Xcode 9/Shared/Mac-like" os: osx osx_image: xcode9 @@ -102,9 +109,9 @@ matrix: - BUILD_DIR=macosx install: [] script: *mactest - - name: "macOS/Xcode 10/Shared/Mac-like" + - name: "macOS/Xcode 8/Shared/Mac-like" os: osx - osx_image: xcode10.2 + osx_image: xcode8 env: - BUILD_DIR=macosx install: [] |