aboutsummaryrefslogtreecommitdiff
path: root/travis
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-11-27 21:51:52 +0100
committerEven Rouault <even.rouault@spatialys.com>2020-11-27 22:00:33 +0100
commit90737bcf698c98b2a8600e4c79fb15a675489929 (patch)
tree8aecc14e808619cf6d3718e7741a4c486720ff30 /travis
parentc85a44110d19080215183e0e07d81408d68cdbec (diff)
downloadPROJ-90737bcf698c98b2a8600e4c79fb15a675489929.tar.gz
PROJ-90737bcf698c98b2a8600e4c79fb15a675489929.zip
Move linux_gcc 4.8 job to github action, and on Travis-CI only keep the doc publishing
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/after_success.sh7
-rwxr-xr-xtravis/install.sh8
-rwxr-xr-xtravis/linux_gcc/before_install.sh22
-rwxr-xr-xtravis/linux_gcc/install.sh8
-rwxr-xr-xtravis/publish_doc/after_success.sh (renamed from travis/linux_gcc/after_success.sh)0
-rwxr-xr-xtravis/publish_doc/before_install.sh7
-rwxr-xr-xtravis/publish_doc/install.sh3
7 files changed, 10 insertions, 45 deletions
diff --git a/travis/after_success.sh b/travis/after_success.sh
index 095bafbd..abe11d91 100755
--- a/travis/after_success.sh
+++ b/travis/after_success.sh
@@ -2,13 +2,6 @@
set -e
-if [ "$BUILD_NAME" != "linux_clang" ]; then
- # coveralls falsely reports .c-files in the build directories as having 100% coverage so we exclude them
- coveralls --build-root src --extension .c --extension .cpp \
- --exclude build_autoconf --exclude build_cmake --exclude test --exclude examples \
- --exclude include/proj/internal/nlohmann
-fi
-
echo "$TRAVIS_SECURE_ENV_VARS"
./travis/build_docs.sh
# Only build and publish docs when changes are made on most recent maintenance branch
diff --git a/travis/install.sh b/travis/install.sh
index 84e7de25..6426e1b3 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -141,12 +141,4 @@ if [ "$BUILD_NAME" != "linux_gcc8" -a "$BUILD_NAME" != "linux_gcc_32bit" ]; then
fi
make >/dev/null
make check
-
- if [ "$BUILD_NAME" != "linux_clang" ]; then
- mv src/.libs/*.gc* src
- mv src/conversions/.libs/*.gc* src/conversions
- mv src/iso19111/.libs/*.gc* src/iso19111
- mv src/projections/.libs/*.gc* src/projections
- mv src/transformations/.libs/*.gc* src/transformations
- fi
fi
diff --git a/travis/linux_gcc/before_install.sh b/travis/linux_gcc/before_install.sh
deleted file mode 100755
index 3068794d..00000000
--- a/travis/linux_gcc/before_install.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./travis/before_install_apt.sh
-./travis/before_install_pip.sh
-
-sudo apt-get install -qq \
- lcov \
- doxygen graphviz \
- sqlite3 libsqlite3-dev \
- libtiff-dev libcurl4-openssl-dev \
- cppcheck
-
-scripts/cppcheck.sh
-scripts/doxygen.sh
-
-pip3 install --user sphinxcontrib-bibtex
-pip3 install --user cpp-coveralls
-pip3 install --user cmake==3.9.6
-
-./travis/docker.sh
diff --git a/travis/linux_gcc/install.sh b/travis/linux_gcc/install.sh
deleted file mode 100755
index 5dd97f07..00000000
--- a/travis/linux_gcc/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" CXXFLAGS="-Werror" ./travis/install.sh
diff --git a/travis/linux_gcc/after_success.sh b/travis/publish_doc/after_success.sh
index 6602f6c3..6602f6c3 100755
--- a/travis/linux_gcc/after_success.sh
+++ b/travis/publish_doc/after_success.sh
diff --git a/travis/publish_doc/before_install.sh b/travis/publish_doc/before_install.sh
new file mode 100755
index 00000000..bbb7b35b
--- /dev/null
+++ b/travis/publish_doc/before_install.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+
+./travis/before_install_apt.sh
+./travis/before_install_pip.sh
+./travis/docker.sh
diff --git a/travis/publish_doc/install.sh b/travis/publish_doc/install.sh
new file mode 100755
index 00000000..d9628ae7
--- /dev/null
+++ b/travis/publish_doc/install.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+set -e