From 5fc8044e933eac740ebdd271594540112d0e63f1 Mon Sep 17 00:00:00 2001 From: Fytch Date: Wed, 18 Dec 2019 21:11:01 +0100 Subject: [PATCH 1/5] add more compilers to travis --- .travis.yml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/.travis.yml b/.travis.yml index 65a01f5..16a7f28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,14 @@ matrix: packages: - g++-8 env: COMPILER=g++-8 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-9 + env: COMPILER=g++-9 - compiler: clang addons: apt: @@ -139,6 +147,48 @@ matrix: env: - COMPILER=clang++-6.0 - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + packages: + - clang-7 + - libc++-dev + - libc++abi-dev + env: + - COMPILER=clang++-7 + - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + packages: + - clang-8 + - libc++-dev + - libc++abi-dev + env: + - COMPILER=clang++-8 + - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + packages: + - clang-9 + - libc++-dev + - libc++abi-dev + env: + - COMPILER=clang++-9 + - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" script: - uname -a From 02bf4442a9a99613a1cbbc194e3e0a24b17f4bc9 Mon Sep 17 00:00:00 2001 From: Fytch Date: Wed, 18 Dec 2019 21:19:15 +0100 Subject: [PATCH 2/5] nicer build matrix --- .travis.yml | 61 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 16a7f28..bfed924 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,9 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-4.9 - env: COMPILER=g++-4.9 + env: + - CC=gcc-4.9 + - CXX=g++-4.9 - compiler: gcc addons: apt: @@ -23,7 +25,9 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-5 - env: COMPILER=g++-5 + env: + - CC=gcc-5 + - CXX=g++-5 - compiler: gcc addons: apt: @@ -31,7 +35,9 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-6 - env: COMPILER=g++-6 + env: + - CC=gcc-6 + - CXX=g++-6 - compiler: gcc addons: apt: @@ -39,7 +45,9 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-7 - env: COMPILER=g++-7 + env: + - CC=gcc-7 + - CXX=g++-7 - compiler: gcc addons: apt: @@ -47,7 +55,9 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-8 - env: COMPILER=g++-8 + env: + - CC=gcc-8 + - CXX=g++-8 - compiler: gcc addons: apt: @@ -55,7 +65,9 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-9 - env: COMPILER=g++-9 + env: + - CC=gcc-9 + - CXX=g++-9 - compiler: clang addons: apt: @@ -67,7 +79,8 @@ matrix: - libc++-dev - libc++abi-dev env: - - COMPILER=clang++-3.6 + - CC=clang-3.6 + - CXX=clang++-3.6 - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: @@ -80,7 +93,8 @@ matrix: - libc++-dev - libc++abi-dev env: - - COMPILER=clang++-3.7 + - CC=clang-3.7 + - CXX=clang++-3.7 - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: @@ -93,7 +107,8 @@ matrix: - libc++-dev - libc++abi-dev env: - - COMPILER=clang++-3.8 + - CC=clang-3.8 + - CXX=clang++-3.8 - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: @@ -106,7 +121,8 @@ matrix: - libc++-dev - libc++abi-dev env: - - COMPILER=clang++-3.9 + - CC=clang-3.9 + - CXX=clang++-3.9 - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: @@ -119,7 +135,8 @@ matrix: - libc++-dev - libc++abi-dev env: - - COMPILER=clang++-4.0 + - CC=clang-4.0 + - CXX=clang++-4.0 - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: @@ -132,7 +149,8 @@ matrix: - libc++-dev - libc++abi-dev env: - - COMPILER=clang++-5.0 + - CC=clang-5.0 + - CXX=clang++-5.0 - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: @@ -145,7 +163,8 @@ matrix: - libc++-dev - libc++abi-dev env: - - COMPILER=clang++-6.0 + - CC=clang-6.0 + - CXX=clang++-6.0 - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: @@ -159,7 +178,8 @@ matrix: - libc++-dev - libc++abi-dev env: - - COMPILER=clang++-7 + - CC=clang-7 + - CXX=clang++-7 - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: @@ -173,7 +193,8 @@ matrix: - libc++-dev - libc++abi-dev env: - - COMPILER=clang++-8 + - CC=clang-8 + - CXX=clang++-8 - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: @@ -187,23 +208,25 @@ matrix: - libc++-dev - libc++abi-dev env: - - COMPILER=clang++-9 + - CC=clang-9 + - CXX=clang++-9 - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" script: - uname -a - cmake --version - - $COMPILER --version + - $CC --version + - $CXX --version - mkdir bin_noexcept - cd bin_noexcept - - cmake .. $CMAKE_FLAGS -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_CXX_COMPILER=$COMPILER -DPROGRAMOPTIONS_BUILD_TEST=OFF -DPROGRAMOPTIONS_NO_EXCEPTIONS=ON + - cmake .. $CMAKE_FLAGS -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DPROGRAMOPTIONS_BUILD_TEST=OFF -DPROGRAMOPTIONS_NO_EXCEPTIONS=ON - cmake --build . - cd .. - mkdir bin - cd bin - - cmake .. $CMAKE_FLAGS -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_CXX_COMPILER=$COMPILER + - cmake .. $CMAKE_FLAGS -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX - cmake --build . - ./Test From a34655a9490b6a797305a5f9f979480d4e9ba9ec Mon Sep 17 00:00:00 2001 From: Fytch Date: Wed, 18 Dec 2019 21:24:27 +0100 Subject: [PATCH 3/5] remove libc++ from clang 7,8,9 in travis --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index bfed924..9760866 100644 --- a/.travis.yml +++ b/.travis.yml @@ -175,8 +175,6 @@ matrix: key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' packages: - clang-7 - - libc++-dev - - libc++abi-dev env: - CC=clang-7 - CXX=clang++-7 @@ -190,8 +188,6 @@ matrix: key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' packages: - clang-8 - - libc++-dev - - libc++abi-dev env: - CC=clang-8 - CXX=clang++-8 @@ -205,8 +201,6 @@ matrix: key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' packages: - clang-9 - - libc++-dev - - libc++abi-dev env: - CC=clang-9 - CXX=clang++-9 From 2038f09cc7099a5b4f35fc96df38951ab8be565e Mon Sep 17 00:00:00 2001 From: Fytch Date: Wed, 18 Dec 2019 21:32:43 +0100 Subject: [PATCH 4/5] maybe this dist works? --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9760866..03aa158 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: cpp -dist: trusty -sudo: required +sudo: false +dist: xenial notifications: email: false From 91dda92af04621cf526ddd83e7d11297147925ae Mon Sep 17 00:00:00 2001 From: Fytch Date: Wed, 18 Dec 2019 21:42:51 +0100 Subject: [PATCH 5/5] maybe this? no more stdlib flags --- .travis.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 03aa158..d635118 100644 --- a/.travis.yml +++ b/.travis.yml @@ -143,29 +143,25 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-5.0 + - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' packages: - clang-5.0 - - libc++-dev - - libc++abi-dev env: - CC=clang-5.0 - CXX=clang++-5.0 - - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-6.0 + - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' packages: - clang-6.0 - - libc++-dev - - libc++abi-dev env: - CC=clang-6.0 - CXX=clang++-6.0 - - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: apt: @@ -178,7 +174,6 @@ matrix: env: - CC=clang-7 - CXX=clang++-7 - - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: apt: @@ -191,7 +186,6 @@ matrix: env: - CC=clang-8 - CXX=clang++-8 - - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" - compiler: clang addons: apt: @@ -204,7 +198,6 @@ matrix: env: - CC=clang-9 - CXX=clang++-9 - - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++" script: - uname -a