From 44d36b0777e2194f24961fa3bf201792b658ab92 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sat, 13 Jul 2019 17:29:00 +0000 Subject: Add experimental xcode11 build steps to travis. Also sort different gcc/xcode versions from high to low --- .travis.yml | 53 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index b28e410..08acabc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,70 +31,74 @@ 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: [] - script: &mactest - - make all - # The styles=develop avoids some weird problems on OSX - - make test styles=develop + script: *mactest + - 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,13 +106,16 @@ 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: [] - script: *mactest + script: &mactest + - make all + # The styles=develop avoids some weird problems on OSX + - make test styles=develop # Test with mingw-w64 (32 bit) cross-compile # Doesn't run tests because wine is only an imperfect Windows emulation - name: "Linux-cross-Windows-32/GCC/Shared/no test" -- cgit v0.12 From 440325f1fa705f0ab32f1590644516a3fdd149cb Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 15 Jul 2019 07:15:23 +0000 Subject: Fix travis build for xcode 9/10/11 --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08acabc..886366b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,10 @@ matrix: env: - BUILD_DIR=macosx install: [] - script: *mactest + script: &mactest + - 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 @@ -112,10 +115,7 @@ matrix: env: - BUILD_DIR=macosx install: [] - script: &mactest - - make all - # The styles=develop avoids some weird problems on OSX - - make test styles=develop + script: *mactest # Test with mingw-w64 (32 bit) cross-compile # Doesn't run tests because wine is only an imperfect Windows emulation - name: "Linux-cross-Windows-32/GCC/Shared/no test" -- cgit v0.12