From d5ce6ba77a7a92a5bc214483ac3476f90136d1cb Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Sun, 21 Oct 2018 01:00:49 +0100 Subject: [PATCH 01/10] build: fix compiler selection on Travis builds --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 004c6ab4cf7236..b2b127d65089b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ matrix: script: - make -j2 test before_install: + - export CXX_host="ccache clang++ -Qunused-arguments" - export CXX="ccache clang++ -Qunused-arguments" - export CC="ccache clang -Qunused-arguments -Wno-unknown-warning-option" - export JOBS=2 From afe2216036eca60da54856d1de0475f000e017d7 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Sun, 21 Oct 2018 02:08:02 +0100 Subject: [PATCH 02/10] fixup try setting library path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b2b127d65089b0..0f3ba640788c88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: script: - make -j2 test before_install: - - export CXX_host="ccache clang++ -Qunused-arguments" + - export LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib":$LD_LIBRARY_PATH - export CXX="ccache clang++ -Qunused-arguments" - export CC="ccache clang -Qunused-arguments -Wno-unknown-warning-option" - export JOBS=2 From b001ccfc511157cf16e3ed79ef302245ed1741b4 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Sun, 21 Oct 2018 02:13:43 +0100 Subject: [PATCH 03/10] fixup set CPATH https://github.com/travis-ci/travis-ci/issues/9550 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0f3ba640788c88..e247f3f138f806 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ matrix: - make -j2 test before_install: - export LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib":$LD_LIBRARY_PATH + - export CPATH="/usr/local/clang-5.0.0/include/c++/v1" - export CXX="ccache clang++ -Qunused-arguments" - export CC="ccache clang -Qunused-arguments -Wno-unknown-warning-option" - export JOBS=2 From 795d73851f5fc041817ca0d9c0d6e870b92cc46d Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Sun, 21 Oct 2018 02:32:24 +0100 Subject: [PATCH 04/10] fixup use libc++ --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e247f3f138f806..dc840c8820090d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,6 @@ matrix: before_install: - export LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib":$LD_LIBRARY_PATH - export CPATH="/usr/local/clang-5.0.0/include/c++/v1" - - export CXX="ccache clang++ -Qunused-arguments" + - export CXX="ccache clang++ -stdlib=libc++ -Qunused-arguments" - export CC="ccache clang -Qunused-arguments -Wno-unknown-warning-option" - export JOBS=2 From 991951dff99703f498f74a15590cf1098177f543 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Sun, 21 Oct 2018 23:29:37 +0100 Subject: [PATCH 05/10] fixup remove `CPATH` and `LD_LIBRARY_PATH` --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc840c8820090d..4d522e01fcb2c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,6 @@ matrix: script: - make -j2 test before_install: - - export LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib":$LD_LIBRARY_PATH - - export CPATH="/usr/local/clang-5.0.0/include/c++/v1" - export CXX="ccache clang++ -stdlib=libc++ -Qunused-arguments" - export CC="ccache clang -Qunused-arguments -Wno-unknown-warning-option" - export JOBS=2 From 5a28990d9fff1ebc4970ffbb33b724ed13b0dcfd Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Sun, 21 Oct 2018 23:39:00 +0100 Subject: [PATCH 06/10] fixup restore `LD_LIBRARY_PATH` --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4d522e01fcb2c2..ec871390dcd14e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ matrix: script: - make -j2 test before_install: + - export LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib":$LD_LIBRARY_PATH - export CXX="ccache clang++ -stdlib=libc++ -Qunused-arguments" - export CC="ccache clang -Qunused-arguments -Wno-unknown-warning-option" - export JOBS=2 From 366ed400fe33ccda572235e5ce0858e2498c12db Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Mon, 22 Oct 2018 00:29:11 +0100 Subject: [PATCH 07/10] fixup move env vars to env --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec871390dcd14e..be4360d984fa24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,13 +15,15 @@ matrix: # Lint the first commit in the PR. - \[ -z "$TRAVIS_COMMIT_RANGE" \] || (echo -e '\nLinting the commit message according to the guidelines at https://goo.gl/p2fr5Q\n' && git log $TRAVIS_COMMIT_RANGE --pretty=format:'%h' --no-merges | tail -1 | xargs npx -q core-validate-commit --no-validate-metadata) - name: "Test Suite" + env: + - CC="ccache clang" + - CFLAGS="-Qunused-arguments -Wno-unknown-warning-option" + - CXX="ccache clang++" + - CXXFLAGS="-Qunused-arguments -stdlib=libc++" + - JOBS=2 + - LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib":$LD_LIBRARY_PATH install: - ./configure - make -j2 V= script: - make -j2 test - before_install: - - export LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib":$LD_LIBRARY_PATH - - export CXX="ccache clang++ -stdlib=libc++ -Qunused-arguments" - - export CC="ccache clang -Qunused-arguments -Wno-unknown-warning-option" - - export JOBS=2 From e6f4cc98597aab0744e94fadd6a08f1c4db70127 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Mon, 22 Oct 2018 00:42:43 +0100 Subject: [PATCH 08/10] fixup move env vars to env --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index be4360d984fa24..939433338e1a4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: - CXX="ccache clang++" - CXXFLAGS="-Qunused-arguments -stdlib=libc++" - JOBS=2 - - LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib":$LD_LIBRARY_PATH + - LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib" install: - ./configure - make -j2 V= From da1bf00fd372cf29da7d783ca98d2d2436474d8c Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Mon, 22 Oct 2018 23:41:30 +0100 Subject: [PATCH 09/10] fixup --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 939433338e1a4d..be4360d984fa24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: - CXX="ccache clang++" - CXXFLAGS="-Qunused-arguments -stdlib=libc++" - JOBS=2 - - LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib" + - LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib":$LD_LIBRARY_PATH install: - ./configure - make -j2 V= From e3c289e15587a4aba91aed86a5753c84d9deccc8 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Tue, 23 Oct 2018 03:08:39 +0100 Subject: [PATCH 10/10] fixup --- .travis.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index be4360d984fa24..2d5fb9174911f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,14 +15,11 @@ matrix: # Lint the first commit in the PR. - \[ -z "$TRAVIS_COMMIT_RANGE" \] || (echo -e '\nLinting the commit message according to the guidelines at https://goo.gl/p2fr5Q\n' && git log $TRAVIS_COMMIT_RANGE --pretty=format:'%h' --no-merges | tail -1 | xargs npx -q core-validate-commit --no-validate-metadata) - name: "Test Suite" - env: - - CC="ccache clang" - - CFLAGS="-Qunused-arguments -Wno-unknown-warning-option" - - CXX="ccache clang++" - - CXXFLAGS="-Qunused-arguments -stdlib=libc++" - - JOBS=2 - - LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib":$LD_LIBRARY_PATH install: + - export CC="ccache clang -Qunused-arguments -Wno-unknown-warning-option" + - export CXX="ccache clang++ -Qunused-arguments -stdlib=libc++" + - export JOBS=2 + - export LD_LIBRARY_PATH="/usr/local/clang-5.0.0/lib":$LD_LIBRARY_PATH - ./configure - make -j2 V= script: