diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-11-27 21:26:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 21:26:17 +0100 |
| commit | 60ae9abbf9ad6b6a6f1fae5f7bb1a7da2a2a59dc (patch) | |
| tree | 7a02761ec3db58bfdd15c782117768b59a7cfbff /travis | |
| parent | a24c02199fbab7d25c5e9586677c89aff9c5cb6c (diff) | |
| parent | 3b0102df6f1152563f37bfe2617535d81516cb75 (diff) | |
| download | PROJ-60ae9abbf9ad6b6a6f1fae5f7bb1a7da2a2a59dc.tar.gz PROJ-60ae9abbf9ad6b6a6f1fae5f7bb1a7da2a2a59dc.zip | |
Merge pull request #2459 from rouault/gha_gcc_32bit
Move linux gcc 32bit job to Github actions
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/install.sh | 2 | ||||
| -rwxr-xr-x | travis/linux_gcc8/after_success.sh | 5 | ||||
| -rwxr-xr-x | travis/linux_gcc8/before_install.sh | 21 | ||||
| -rwxr-xr-x | travis/linux_gcc8/install.sh | 8 |
4 files changed, 1 insertions, 35 deletions
diff --git a/travis/install.sh b/travis/install.sh index a4d8352a..84e7de25 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -99,7 +99,7 @@ if [ $TRAVIS_OS_NAME != "osx" ]; then fi fi -if [ "$BUILD_NAME" != "linux_gcc8" ]; then +if [ "$BUILD_NAME" != "linux_gcc8" -a "$BUILD_NAME" != "linux_gcc_32bit" ]; then # cmake build from generated tarball mkdir build_cmake diff --git a/travis/linux_gcc8/after_success.sh b/travis/linux_gcc8/after_success.sh deleted file mode 100755 index 70c6f5cb..00000000 --- a/travis/linux_gcc8/after_success.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -e - -#./travis/after_success.sh diff --git a/travis/linux_gcc8/before_install.sh b/travis/linux_gcc8/before_install.sh deleted file mode 100755 index ff6c0927..00000000 --- a/travis/linux_gcc8/before_install.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -e - -./travis/before_install_apt.sh -./travis/before_install_pip.sh - -sudo aptitude remove -q -y libtiff-dev libcurl4-gnutls-dev -sudo aptitude install -q -y \ - lcov \ - doxygen graphviz \ - sqlite3 libsqlite3-dev:$ARCH \ - libtiff-dev:$ARCH libcurl4-openssl-dev:$ARCH - -#scripts/cppcheck.sh -#scripts/doxygen.sh - -#pip install --user sphinxcontrib-bibtex -#pip install --user cpp-coveralls - -#./travis/docker.sh diff --git a/travis/linux_gcc8/install.sh b/travis/linux_gcc8/install.sh deleted file mode 100755 index 7fa8cfa4..00000000 --- a/travis/linux_gcc8/install.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -e - -export CCACHE_CPP2=yes -export PROJ_DB_CACHE_DIR="$HOME/.ccache" - -CC="ccache $CC" CXX="ccache $CXX" CFLAGS="-std=c99 -Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" ./travis/install.sh |