From 4013aeaaf7796cfff6b97668870ce4a2af3d509a Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Wed, 25 Sep 2019 11:47:40 +1200 Subject: Upgrade testing from trusty to xenial, and also: * From openjdk-7 via apt to openjdk-11 via Travis CI xenial's $JAVA_HOME * From mingw 4.8 -> 5.3, as supported by xenial * clang+llvm for csa kept at version 6.0.0, but for ubuntu-16.04 * Furthermore xenial implicitly has many upgrades, specifically: - gcc 4.8.4 -> 5.4.0 - clang 4.0.0 -> 5.0.0 - cmake 3.9.2 -> 3.12.4 - python 3.4.3 -> 3.5.2 * cppcheck version kept at 1.61 (for trusty) due to many false positives with version 1.72 (for xenial) * Community code contribution documentation simplified to remove version of cppcheck, as this may outdated with updates to scripts --- travis/linux_gcc/before_install.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'travis/linux_gcc') diff --git a/travis/linux_gcc/before_install.sh b/travis/linux_gcc/before_install.sh index 30793e69..4dbd52c3 100755 --- a/travis/linux_gcc/before_install.sh +++ b/travis/linux_gcc/before_install.sh @@ -6,19 +6,22 @@ set -e ./travis/before_install_pip.sh sudo apt-get install -qq \ - cppcheck \ lcov \ doxygen graphviz \ - openjdk-7-jdk \ sqlite3 libsqlite3-dev +# Install Cppcheck to maintain version 1.61 +LIBTINYXML=libtinyxml2-0.0.0_0~git20120518.1.a2ae54e-1_amd64.deb +CPPCHECK=cppcheck_1.61-1_amd64.deb +wget -q http://security.ubuntu.com/ubuntu/pool/universe/t/tinyxml2/$LIBTINYXML +wget -q http://security.ubuntu.com/ubuntu/pool/universe/c/cppcheck/$CPPCHECK +sudo dpkg -i $LIBTINYXML +sudo dpkg -i $CPPCHECK + scripts/cppcheck.sh scripts/doxygen.sh -# Force sphinxcontrib-bibtex version to 0.4.2, because 1.0.0 requires -# sphinx >= 2.0 which is only available on Python >= 3.5, and this config -# has only 3.4 -pip3 install --user sphinxcontrib-bibtex==0.4.2 +pip3 install --user sphinxcontrib-bibtex pip3 install --user cpp-coveralls ./travis/docker.sh -- cgit v1.2.3