diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-16 09:25:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-16 09:25:08 (GMT) |
| commit | 117c6b9d73019c6560d1fa7eb8a3e8d2584bc3ab (patch) | |
| tree | 76d5ebf5457b7427ee23a827a09ec097fe73491d /.travis.yml | |
| parent | 60397b30ebab72df7bb81e4adc4e619535688f9a (diff) | |
| parent | 9b29b188a419446b6143817cb8b36695c6fa41fa (diff) | |
| download | tcl-117c6b9d73019c6560d1fa7eb8a3e8d2584bc3ab.zip tcl-117c6b9d73019c6560d1fa7eb8a3e8d2584bc3ab.tar.gz tcl-117c6b9d73019c6560d1fa7eb8a3e8d2584bc3ab.tar.bz2 | |
Merge 8.6
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 68bb273..a9767ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,52 +59,52 @@ 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: &gcc7deps apt: sources: - ubuntu-toolchain-r-test packages: - - g++-7 + - g++-4.9 env: - BUILD_DIR=unix - name: "Linux/GCC 7/Shared: UTF_MAX=6" @@ -132,14 +132,14 @@ matrix: - BUILD_DIR=unix - CFGOPT=CFLAGS=-DTCL_NO_DEPRECATED=1 # 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: [] @@ -147,6 +147,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 @@ -154,9 +161,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: [] |