From b67042c454806c486b61fa24822e95406c197b19 Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Sat, 25 Aug 2018 02:42:35 +0800 Subject: [PATCH 1/5] Fix Travis-CI builds Since Aug 2017, Ubuntu Trusty is the default, and the official cmake is new enough (2.8.12.2) - drop cmake PPA stuffs. Also actually uses container-based instances for faster builds. [1] https://docs.travis-ci.com/user/reference/overview/ --- .travis.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78f1e1a24..62f55ae42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: c # container-based builds -sudo: required +sudo: false git: depth: 1 @@ -34,10 +34,6 @@ matrix: before_install: - pip install --user cpp-coveralls - P_JOBS="-j$(getconf _NPROCESSORS_ONLN)" - - yes | sudo add-apt-repository ppa:kalakris/cmake - - sudo apt-get update -qq - -install: sudo apt-get install cmake script: - if [ x$BUILD == xautotools ]; then ./autogen.sh && ./configure $CONFIGURE_OPTION && make $P_JOBS CFLAGS="$CFLAGS -Wall -Werror" && make $P_JOBS check && make $P_JOBS release && LC_ALL=c sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi @@ -57,9 +53,6 @@ addons: build_command: "make $P_JOBS" branch_pattern: coverity_scan apt: - sources: - # sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json - - kalakris-cmake packages: # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise - cmake From b2d6734ec85af4d6e0bd5357ef85046cfa74c44a Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Sat, 25 Aug 2018 03:02:11 +0800 Subject: [PATCH 2/5] Use internal-sqlite instead of static-sqlite, following 570ab6be --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62f55ae42..e32cbde36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,9 @@ matrix: - compiler: gcc env: BUILD=cmake CMAKE_OPTION="-DENABLE_GCOV=yes -DUSE_VALGRIND=no" COVERALLS=yes - compiler: clang - env: BUILD=cmake CMAKE_OPTION="-DWITH_STATIC_SQLITE3=yes" + env: BUILD=cmake CMAKE_OPTION="-DWITH_INTERNAL_SQLITE3=yes" - compiler: gcc - env: BUILD=autotools CONFIGURE_OPTION="--with-static_sqlite3=yes" + env: BUILD=autotools CONFIGURE_OPTION="--with-internal-sqlite3=yes" - compiler: gcc env: BUILD=cmake CMAKE_OPTION="-DWITH_SQLITE3=no" - compiler: clang From 9c7591bc9981eded9201739b9035264e9538be09 Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Sat, 25 Aug 2018 04:06:55 +0800 Subject: [PATCH 3/5] Fix LSan --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e32cbde36..0a15881bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ matrix: - compiler: gcc env: BUILD=cmake - compiler: clang + # LSan does not work in containers https://github.com/travis-ci/travis-ci/issues/9033 + sudo: true env: BUILD=cmake CMAKE_OPTION="-DUSE_VALGRIND=no -DNO_UNDEFINED=no" CFLAGS="-fsanitize=address -fsanitize=undefined" - compiler: gcc env: BUILD=cmake CMAKE_OPTION="-DENABLE_GCOV=yes -DUSE_VALGRIND=no" COVERALLS=yes From 3a2212a6884c960466db85610a8166818f5665da Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Sat, 25 Aug 2018 04:37:07 +0800 Subject: [PATCH 4/5] Tolerate unused const warnings --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a15881bb..63720ac83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,8 @@ before_install: - P_JOBS="-j$(getconf _NPROCESSORS_ONLN)" script: - - if [ x$BUILD == xautotools ]; then ./autogen.sh && ./configure $CONFIGURE_OPTION && make $P_JOBS CFLAGS="$CFLAGS -Wall -Werror" && make $P_JOBS check && make $P_JOBS release && LC_ALL=c sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi - - if [ x$BUILD == xcmake ]; then CFLAGS="$CFLAGS -Wall -Werror" cmake . $CMAKE_OPTION && make $P_JOBS && make $P_JOBS check && LC_ALL=C sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi + - if [ x$BUILD == xautotools ]; then ./autogen.sh && ./configure $CONFIGURE_OPTION && make $P_JOBS CFLAGS="$CFLAGS -Wall -Werror -Wno-unused-const-variable" && make $P_JOBS check && make $P_JOBS release && LC_ALL=c sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi + - if [ x$BUILD == xcmake ]; then CFLAGS="$CFLAGS -Wall -Werror -Wno-unused-const-variable" cmake . $CMAKE_OPTION && make $P_JOBS && make $P_JOBS check && LC_ALL=C sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi after_success: - if [ x$COVERALLS == xyes ]; then coveralls --exclude src/tools --exclude contrib --exclude test --exclude thirdparty --exclude-pattern '.*CMake[^/]+\.c(?:pp)?' --exclude-pattern '.*/[_A-Z0-9]+\.c(?:pp)?' --exclude-pattern '[^\.]*\.h'; fi From 5e53191d44e090dbe9018c600f1730705dd1d9ab Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Sat, 16 Mar 2019 19:46:15 +0800 Subject: [PATCH 5/5] Show compilation commands if the build system is autotools --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 63720ac83..5da34386e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ before_install: - P_JOBS="-j$(getconf _NPROCESSORS_ONLN)" script: - - if [ x$BUILD == xautotools ]; then ./autogen.sh && ./configure $CONFIGURE_OPTION && make $P_JOBS CFLAGS="$CFLAGS -Wall -Werror -Wno-unused-const-variable" && make $P_JOBS check && make $P_JOBS release && LC_ALL=c sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi + - if [ x$BUILD == xautotools ]; then ./autogen.sh && ./configure $CONFIGURE_OPTION && make $P_JOBS V=1 CFLAGS="$CFLAGS -Wall -Werror -Wno-unused-const-variable" && make $P_JOBS check && make $P_JOBS release && LC_ALL=c sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi - if [ x$BUILD == xcmake ]; then CFLAGS="$CFLAGS -Wall -Werror -Wno-unused-const-variable" cmake . $CMAKE_OPTION && make $P_JOBS && make $P_JOBS check && LC_ALL=C sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi after_success: