From f9e8143ac5e6d5cb123140357e0c96a51efc4816 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sun, 23 Jun 2019 08:50:30 +0100 Subject: [PATCH 1/4] CI: update distribution and clang testing. --- .travis.yml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9cac6ec..c05a642 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ os: - linux - osx +dist : xenial + branches: only: - master @@ -159,7 +161,7 @@ matrix: - clang-3.5 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.5 + - llvm-toolchain-xenial-3.5 - os: linux env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11 @@ -169,7 +171,7 @@ matrix: - clang-3.6 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.6 + - llvm-toolchain-xenial-3.6 - os: linux env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11 @@ -179,7 +181,7 @@ matrix: - clang-3.7 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 + - llvm-toolchain-xenial-3.7 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z @@ -189,7 +191,7 @@ matrix: - clang-3.8 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.8 + - llvm-toolchain-xenial-3.8 - os: linux env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z @@ -199,7 +201,7 @@ matrix: - clang-3.9 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 + - llvm-toolchain-xenial-3.9 - os: linux compiler: clang++-4.0 @@ -234,6 +236,17 @@ matrix: - ubuntu-toolchain-r-test - llvm-toolchain-trusty-6.0 + - os: linux + compiler: clang++-7 + env: TOOLSET=clang COMPILER=clang++-7 CXXSTD=03,11,14,1z + addons: + apt: + packages: + - clang-7 + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-7 + - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z osx_image: xcode10.1 From 17359415f5bcfeb7f82d37015b83755d4ba0e26e Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 24 Jun 2019 16:01:39 +0100 Subject: [PATCH 2/4] Make sure distributions match and are supported. --- .travis.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index c05a642..1827fda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ matrix: - os: linux compiler: g++-4.4 env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x + dist: trusty addons: apt: packages: @@ -45,6 +46,7 @@ matrix: - os: linux compiler: g++-4.6 env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x + dist: trusty addons: apt: packages: @@ -54,6 +56,7 @@ matrix: - os: linux env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11 + dist: trusty addons: apt: packages: @@ -72,6 +75,7 @@ matrix: - os: linux env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11 + dist: trusty addons: apt: packages: @@ -155,53 +159,58 @@ matrix: - os: linux env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11 + dist: trusty addons: apt: packages: - clang-3.5 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-3.5 + - llvm-toolchain-trusty-3.5 - os: linux env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11 + dist: trusty addons: apt: packages: - clang-3.6 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-3.6 + - llvm-toolchain-trusty-3.6 - os: linux env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11 + dist: trusty addons: apt: packages: - clang-3.7 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-3.7 + - llvm-toolchain-trusty-3.7 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z + dist: trusty addons: apt: packages: - clang-3.8 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-3.8 + - llvm-toolchain-trusty-3.8 - os: linux env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z + dist: trusty addons: apt: packages: - clang-3.9 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-3.9 + - llvm-toolchain-trusty-3.9 - os: linux compiler: clang++-4.0 @@ -212,7 +221,7 @@ matrix: - clang-4.0 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-4.0 + - llvm-toolchain-xenial-4.0 - os: linux compiler: clang++-5.0 @@ -223,7 +232,7 @@ matrix: - clang-5.0 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-5.0 + - llvm-toolchain-xenial-5.0 - os: linux compiler: clang++-6.0 @@ -234,7 +243,7 @@ matrix: - clang-6.0 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-6.0 + - llvm-toolchain-xenial-6.0 - os: linux compiler: clang++-7 @@ -245,7 +254,7 @@ matrix: - clang-7 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-7 + - llvm-toolchain-xenial-7 - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z From 86855dac995f9a140dd633489119ed83f1d57077 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Tue, 25 Jun 2019 08:28:17 +0100 Subject: [PATCH 3/4] CI: clang-3.7 needs "precise" distro? --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1827fda..6b02fdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -180,15 +180,15 @@ matrix: - llvm-toolchain-trusty-3.6 - os: linux - env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11 - dist: trusty + dist: precise + env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z addons: apt: packages: - clang-3.7 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-3.7 + - llvm-toolchain-precise-3.7 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z From 5ff6b669eabbc62ca85371867671ce78a97e9d87 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Tue, 25 Jun 2019 12:58:31 +0100 Subject: [PATCH 4/4] CI: Try again to get clang-3.7 working. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6b02fdc..d7e2f8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -180,7 +180,7 @@ matrix: - llvm-toolchain-trusty-3.6 - os: linux - dist: precise + dist: trusty env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z addons: apt: