diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 74 |
1 files changed, 34 insertions, 40 deletions
diff --git a/.travis.yml b/.travis.yml index b1ed4e5..02e3102 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,20 +6,20 @@ matrix: # Testing on Linux with various compilers - name: "Linux/GCC/Shared" os: linux - dist: xenial + dist: bionic compiler: gcc env: - BUILD_DIR=unix - name: "Linux/GCC/Static" os: linux - dist: xenial + dist: bionic compiler: gcc env: - CFGOPT="--disable-shared" - BUILD_DIR=unix - name: "Linux/GCC/Debug" os: linux - dist: xenial + dist: bionic compiler: gcc env: - BUILD_DIR=unix @@ -27,7 +27,7 @@ matrix: # Older versions of GCC... - name: "Linux/GCC 7/Shared" os: linux - dist: xenial + dist: bionic compiler: gcc-7 addons: apt: @@ -39,7 +39,7 @@ matrix: - BUILD_DIR=unix - name: "Linux/GCC 6/Shared" os: linux - dist: xenial + dist: bionic compiler: gcc-6 addons: apt: @@ -51,7 +51,7 @@ matrix: - BUILD_DIR=unix - name: "Linux/GCC 5/Shared" os: linux - dist: xenial + dist: bionic compiler: gcc-5 addons: apt: @@ -61,49 +61,36 @@ matrix: - g++-5 env: - BUILD_DIR=unix - - name: "Linux/GCC 4.9/Shared" - os: linux - dist: xenial - compiler: gcc-4.9 - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.9 - env: - - BUILD_DIR=unix # Clang - name: "Linux/Clang/Shared" os: linux - dist: xenial + dist: bionic compiler: clang env: - BUILD_DIR=unix - name: "Linux/Clang/Static" os: linux - dist: xenial + dist: bionic compiler: clang env: - CFGOPT="--disable-shared" - BUILD_DIR=unix - name: "Linux/Clang/Debug" os: linux - dist: xenial + dist: bionic compiler: clang env: - BUILD_DIR=unix - CFGOPT="--enable-symbols" # Testing on Mac, various styles - - name: "macOS/Xcode 11/Shared/Unix-like" + - name: "macOS/Xcode 11.3/Shared/Unix-like" os: osx - osx_image: xcode11 + osx_image: xcode11.3 env: - BUILD_DIR=unix - - CFGOPT="--enable-threads" - - name: "macOS/Xcode 11/Shared" + - name: "macOS/Xcode 11.3/Shared" os: osx - osx_image: xcode11 + osx_image: xcode11.3 env: - BUILD_DIR=macosx install: [] @@ -111,6 +98,13 @@ matrix: - make all # The styles=develop avoids some weird problems on OSX - make test styles=develop + - name: "macOS/Xcode 11/Shared" + os: osx + osx_image: xcode11 + env: + - BUILD_DIR=macosx + install: [] + script: *mactest - name: "macOS/Xcode 10/Shared" os: osx osx_image: xcode10.3 @@ -136,7 +130,7 @@ matrix: # Doesn't run tests because wine is only an imperfect Windows emulation - name: "Linux-cross-Windows/GCC/Shared/no test" os: linux - dist: xenial + dist: bionic compiler: x86_64-w64-mingw32-gcc addons: apt: @@ -157,7 +151,7 @@ matrix: # Doesn't run tests because wine is only an imperfect Windows emulation - name: "Linux-cross-Windows-32/GCC/Shared/no test" os: linux - dist: xenial + dist: bionic compiler: i686-w64-mingw32-gcc addons: apt: @@ -183,8 +177,8 @@ matrix: - cd ${BUILD_DIR} install: [] script: - - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=threads -f makefile.vc test' + - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=threads' '-f' makefile.vc all tcltest + - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=threads' '-f' makefile.vc test - name: "Windows/MSVC/Static" os: windows compiler: cl @@ -192,8 +186,8 @@ matrix: before_install: *vcpreinst install: [] script: - - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static,msvcrt,threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static,msvcrt,threads -f makefile.vc test' + - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,msvcrt,threads' '-f' makefile.vc all tcltest + - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,msvcrt,threads' '-f' makefile.vc test - name: "Windows/MSVC/Debug" os: windows compiler: cl @@ -201,8 +195,8 @@ matrix: before_install: *vcpreinst install: [] script: - - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,threads -f makefile.vc test' + - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=symbols,threads' '-f' makefile.vc all tcltest + - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=symbols,threads' '-f' makefile.vc test # Test on Windows with MSVC native (32-bit) - name: "Windows/MSVC-x86/Shared" os: windows @@ -211,8 +205,8 @@ matrix: before_install: *vcpreinst install: [] script: - - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=threads -f makefile.vc test' + - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=threads' '-f' makefile.vc all tcltest + - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=threads' '-f' makefile.vc test - name: "Windows/MSVC-x86/Static" os: windows compiler: cl @@ -220,8 +214,8 @@ matrix: before_install: *vcpreinst install: [] script: - - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static,msvcrt,threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static,msvcrt,threads -f makefile.vc test' + - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=static,msvcrt,threads' '-f' makefile.vc all tcltest + - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=static,msvcrt,threads' '-f' makefile.vc test - name: "Windows/MSVC-x86/Debug" os: windows compiler: cl @@ -229,8 +223,8 @@ matrix: before_install: *vcpreinst install: [] script: - - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols,threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols,threads -f makefile.vc test' + - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=symbols,threads' '-f' makefile.vc all tcltest + - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=symbols,threads' '-f' makefile.vc test # Test on Windows with GCC native - name: "Windows/GCC/Shared" os: windows |