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/csa | |
| 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/csa')
| -rwxr-xr-x | travis/csa/before_install.sh | 11 | ||||
| -rwxr-xr-x | travis/csa/install.sh | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/travis/csa/before_install.sh b/travis/csa/before_install.sh index 58446f65..cdd58257 100755 --- a/travis/csa/before_install.sh +++ b/travis/csa/before_install.sh @@ -1,12 +1,13 @@ #!/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 -qq sqlite3 libsqlite3-dev -wget http://releases.llvm.org/6.0.0/clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz -tar xJf clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz +CLANG_LLVM=clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-14.04 +wget http://releases.llvm.org/6.0.0/$CLANG_LLVM.tar.xz +tar xJf $CLANG_LLVM.tar.xz +mv $CLANG_LLVM clang+llvm-6 diff --git a/travis/csa/install.sh b/travis/csa/install.sh index 12a1bf6d..334389ee 100755 --- a/travis/csa/install.sh +++ b/travis/csa/install.sh @@ -5,7 +5,7 @@ set -e # prepare build files ./autogen.sh -CXXFLAGS="-std=c++11" ./clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-14.04/bin/scan-build -o scanbuildoutput -plist -v ./configure -./clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-14.04/bin/scan-build -o scanbuildoutput -plist -v make -j2 +CXXFLAGS="-std=c++11" ./clang+llvm-6/bin/scan-build -o scanbuildoutput -plist -v ./configure +./clang+llvm-6/bin/scan-build -o scanbuildoutput -plist -v make -j2 if grep -r "\.c" scanbuildoutput | grep "<string>" | grep -v -e "<key>" -e _generated_parser; then echo "error" && /bin/false; else echo "ok"; fi |