From 95ba3fa142bf85d97cb2b629ff2669b6f5367864 Mon Sep 17 00:00:00 2001 From: Stuart Reilly Date: Tue, 16 Jul 2019 17:20:51 +0100 Subject: Add gcc-7 to travis.yml --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9c4fc859c..65a3f67c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,12 +8,28 @@ compiler: - clang - gcc + matrix: + include: + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-7 + env: + - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + exclude: # osx use always clang for build... - os: osx compiler: gcc +before_install: + - eval "${MATRIX_EVAL}" + install: #macos - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi -- cgit v1.2.3 From e923ca4f17c7513ffac44e0a7a2dd97c138a8f44 Mon Sep 17 00:00:00 2001 From: Stuart Reilly Date: Tue, 16 Jul 2019 17:44:58 +0100 Subject: Add gcc-8 and gcc-9 --- .travis.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.travis.yml b/.travis.yml index 65a3f67c9..c75b60320 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,29 @@ matrix: - g++-7 env: - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-8 + env: + - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-9 + env: + - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" + + exclude: # osx use always clang for build... -- cgit v1.2.3 From 79a0cfbcdb3b95f7c4d757ea79c84d5a5986e960 Mon Sep 17 00:00:00 2001 From: Stuart Reilly Date: Tue, 16 Jul 2019 17:55:47 +0100 Subject: Remove gcc7, add clang 8 --- .travis.yml | 25 ++++++++++++------------- configure.seed | 3 --- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index c75b60320..f845b0348 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: c os: - - osx + # - osx # tmp disable osx - linux compiler: @@ -18,30 +18,31 @@ matrix: sources: - ubuntu-toolchain-r-test packages: - - g++-7 + - g++-8 env: - - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + - os: linux - compiler: gcc + compiler: gcc-9 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-8 + - g++-9 env: - - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" - os: linux - compiler: gcc + compiler: clang-8 addons: apt: sources: - - ubuntu-toolchain-r-test + - llvm-toolchain-xenial-8 packages: - - g++-9 + - clang-8 env: - - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" + - MATRIX_EVAL="CC=clang-8 && CXX=clang++-8" @@ -57,9 +58,7 @@ install: #macos - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi #linux - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update || true; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install build-essential; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libpcap-dev libtool autoconf automake autogen; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libpcap-dev autogen; fi before_script: - ./autogen.sh diff --git a/configure.seed b/configure.seed index fbc30ae07..9d60c8944 100644 --- a/configure.seed +++ b/configure.seed @@ -69,9 +69,6 @@ if test $SYSTEM = "Darwin"; then CC=clang fi -if test $ax_cv_PTHREAD_CLANG = "yes"; then - CC=clang -fi HS_LIB= HS_INC= -- cgit v1.2.3 From 098c4228fb5e0b59077a887215607abd247dc793 Mon Sep 17 00:00:00 2001 From: Stuart Reilly Date: Wed, 17 Jul 2019 11:19:39 +0100 Subject: Make travis more explicit --- .travis.yml | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index f845b0348..5bce840eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,36 @@ language: c -os: - # - osx # tmp disable osx - - linux - -compiler: - - clang - - gcc - - matrix: include: + - os: osx + compiler: clang + - os: linux compiler: gcc + addons: + apt: + packages: + - libpcap-dev + - autogen + + - os: linux + compiler: clang + addons: + apt: + packages: + - libpcap-dev + - autogen + + - os: linux + compiler: gcc-8 addons: apt: sources: - ubuntu-toolchain-r-test packages: - g++-8 + - libpcap-dev + - autogen env: - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" @@ -30,6 +42,8 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-9 + - libpcap-dev + - autogen env: - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" @@ -41,6 +55,8 @@ matrix: - llvm-toolchain-xenial-8 packages: - clang-8 + - libpcap-dev + - autogen env: - MATRIX_EVAL="CC=clang-8 && CXX=clang++-8" @@ -57,8 +73,6 @@ before_install: install: #macos - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi -#linux - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libpcap-dev autogen; fi before_script: - ./autogen.sh -- cgit v1.2.3 From cfdf832d3ac900a7c3649668e9b505874a80c5cc Mon Sep 17 00:00:00 2001 From: Stuart Reilly Date: Wed, 17 Jul 2019 11:24:16 +0100 Subject: Remove brew update --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bce840eb..6b2b92c60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,10 +70,6 @@ matrix: before_install: - eval "${MATRIX_EVAL}" -install: -#macos - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi - before_script: - ./autogen.sh # - lcov --directory . --zerocounters @@ -81,7 +77,7 @@ before_script: script: - ./configure - make -# + #after_script: - cd tests - ./do.sh -- cgit v1.2.3 From e2fcb942e8e1b546024bf11da1892b69d7af05b0 Mon Sep 17 00:00:00 2001 From: Stuart Reilly Date: Wed, 17 Jul 2019 11:29:07 +0100 Subject: Add clang-7 --- .travis.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b2b92c60..3046f5239 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,14 +60,22 @@ matrix: env: - MATRIX_EVAL="CC=clang-8 && CXX=clang++-8" + - os: linux + compiler: clang-7 + addons: + apt: + sources: + - llvm-toolchain-xenial-7 + packages: + - clang-7 + - libpcap-dev + - autogen + env: + - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7" - exclude: - # osx use always clang for build... - - os: osx - compiler: gcc -before_install: + before_install: - eval "${MATRIX_EVAL}" before_script: -- cgit v1.2.3 From 065d0c7e9f195006eed317d9133891c02a791ea6 Mon Sep 17 00:00:00 2001 From: Stuart Reilly Date: Wed, 17 Jul 2019 12:14:45 +0100 Subject: Add ubuntu toolchain to clang builds --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3046f5239..4de6f474d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,8 @@ matrix: addons: apt: sources: - - llvm-toolchain-xenial-8 + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-8 packages: - clang-8 - libpcap-dev @@ -65,7 +66,8 @@ matrix: addons: apt: sources: - - llvm-toolchain-xenial-7 + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-7 packages: - clang-7 - libpcap-dev -- cgit v1.2.3