From 14828d9695ab54272fee0dab35a489180c20f2ea Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Wed, 25 Sep 2019 10:58:10 +1200 Subject: Rearrange Travis CI scripts to be more modular * Split global before_install for apt and pip * Use -qq option for apt-get, which implies -y * Use list of targets with apt-get rather than one-per-line * Use local variables for mingw32/install.sh * Show version info for cppcheck, pip and python * Simplify clang+llvm-6 path --- travis/linux_gcc/before_install.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'travis/linux_gcc') diff --git a/travis/linux_gcc/before_install.sh b/travis/linux_gcc/before_install.sh index f7111631..30793e69 100755 --- a/travis/linux_gcc/before_install.sh +++ b/travis/linux_gcc/before_install.sh @@ -1,16 +1,16 @@ #!/bin/bash set -e -sudo apt-get update -qq -sudo apt-get install -qq python3-pip -./travis/before_install.sh +./travis/before_install_apt.sh +./travis/before_install_pip.sh -sudo apt-get install -y cppcheck -sudo apt-get install -qq lcov -sudo apt-get install -qq doxygen graphviz -sudo apt-get install -qq sqlite3 libsqlite3-dev -sudo apt-get install -qq openjdk-7-jdk +sudo apt-get install -qq \ + cppcheck \ + lcov \ + doxygen graphviz \ + openjdk-7-jdk \ + sqlite3 libsqlite3-dev scripts/cppcheck.sh scripts/doxygen.sh -- cgit v1.2.3