diff options
| -rw-r--r-- | .travis.yml | 28 | ||||
| -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, 0 insertions, 62 deletions
diff --git a/.travis.yml b/.travis.yml index f0720523..07138324 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,34 +32,6 @@ matrix: - os: linux dist: bionic compiler: gcc - services: - - docker - env: - - BUILD_NAME=linux_gcc8 - - DETAILS="linux, gcc8" - - DETAILS="linux, gcc8, i386" - - ARCH=i386 - - CC=gcc-8 - - CXX=g++-8 - - CXXFLAGS='-g -O2 -m32 -D_GLIBCXX_ASSERTIONS' - - CFLAGS='-g -O2 -m32' - - TIFF_CFLAGS=-I/usr/include/i386-linux-gnu - - TIFF_LIBS="-L/usr/lib/i386-linux-gnu -ltiff" - - SQLITE3_CFLAGS=-I/usr/include/i386-linux-gnu - - SQLITE3_LIBS="-L/usr/lib/i386-linux-gnu -lsqlite3" - addons: - apt: - sources: - - sourceline: 'ppa:ubuntu-toolchain-r/test' - packages: - - g++-8-multilib - - make - - autoconf - - automake - - - os: linux - dist: bionic - compiler: gcc arch: s390x env: - BUILD_NAME=linux_generic 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 |
