diff options
| author | Mike Taves <mwtoews@gmail.com> | 2019-09-25 10:58:10 +1200 |
|---|---|---|
| committer | Mike Taves <mwtoews@gmail.com> | 2019-09-25 11:16:27 +1200 |
| commit | 14828d9695ab54272fee0dab35a489180c20f2ea (patch) | |
| tree | 2435fe59d4c39a6a73b210886e45776e74dd4689 /travis/linux_gcc/before_install.sh | |
| parent | a71fce63c2d77b6709005667efd577d728b900e9 (diff) | |
| download | PROJ-14828d9695ab54272fee0dab35a489180c20f2ea.tar.gz PROJ-14828d9695ab54272fee0dab35a489180c20f2ea.zip | |
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
Diffstat (limited to 'travis/linux_gcc/before_install.sh')
| -rwxr-xr-x | travis/linux_gcc/before_install.sh | 16 |
1 files changed, 8 insertions, 8 deletions
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 |