aboutsummaryrefslogtreecommitdiffstats
path: root/tests/travis
diff options
context:
space:
mode:
authorKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2016-12-05 20:23:59 +0100
committerKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2017-03-14 20:39:57 +0100
commit8e80500ee68972eef7d9c004823d1a547270334f (patch)
treee5d4f5b1a311f58c28ab6d3b28deda9cf60d2dca /tests/travis
parent03db9833e833959bb2414b736fddb967763d0d4f (diff)
downloadvolse-hubzilla-8e80500ee68972eef7d9c004823d1a547270334f.tar.gz
volse-hubzilla-8e80500ee68972eef7d9c004823d1a547270334f.tar.bz2
volse-hubzilla-8e80500ee68972eef7d9c004823d1a547270334f.zip
:construction_worker: use PHP7.1 and add PostgreSQL9.6
Use newer distro for Travis CI runs. New environment provides PostgreSQL9.6. Also no need to install custom Doxygen, made it optional. Changed default PHP environment from PHP7.0 to current PHP7.1. Changed codecoverage reporting.
Diffstat (limited to 'tests/travis')
-rwxr-xr-xtests/travis/gen_apidocs.sh25
-rwxr-xr-xtests/travis/prepare_pgsql.sh2
2 files changed, 14 insertions, 13 deletions
diff --git a/tests/travis/gen_apidocs.sh b/tests/travis/gen_apidocs.sh
index 248818117..ed5e429fa 100755
--- a/tests/travis/gen_apidocs.sh
+++ b/tests/travis/gen_apidocs.sh
@@ -34,20 +34,21 @@ if [[ "$TRAVIS_JOB_NUMBER" != "${TRAVIS_BUILD_NUMBER}.1" ]]; then
exit
fi
-# Get newer Doxygen
-#echo "Doxygen version 1.7 is too old for us :("
-#doxygen --version
+echo "Doxygen version >= 1.8 is required"
+doxygen --version
-# Travis CI has an old Doxygen 1.7 build, so we fetch a recent static binary
-export DOXY_BINPATH=$HOME/doxygen/doxygen-$DOXY_VER/bin
-if [ ! -e "$DOXY_BINPATH/doxygen" ]; then
- echo "Installing newer Doxygen $DOXY_VER ..."
- mkdir -p $HOME/doxygen && cd $HOME/doxygen
- wget -O - http://ftp.stack.nl/pub/users/dimitri/doxygen-$DOXY_VER.linux.bin.tar.gz | tar xz
- export PATH=$PATH:$DOXY_BINPATH
+# Check if newer version of Doxygen should be used
+if [ ! -z "$DOXY_VER" ]; then
+ export DOXY_BINPATH=$HOME/doxygen/doxygen-$DOXY_VER/bin
+ if [ ! -e "$DOXY_BINPATH/doxygen" ]; then
+ echo "Installing newer Doxygen $DOXY_VER ..."
+ mkdir -p $HOME/doxygen && cd $HOME/doxygen
+ wget -O - http://ftp.stack.nl/pub/users/dimitri/doxygen-$DOXY_VER.linux.bin.tar.gz | tar xz
+ export PATH=$DOXY_BINPATH:$PATH
+ fi
+ echo "Doxygen version"
+ doxygen --version
fi
-echo "Doxygen version"
-doxygen --version
echo "Generating Doxygen API documentation ..."
cd $TRAVIS_BUILD_DIR
diff --git a/tests/travis/prepare_pgsql.sh b/tests/travis/prepare_pgsql.sh
index 64c3524e7..dcd83f3be 100755
--- a/tests/travis/prepare_pgsql.sh
+++ b/tests/travis/prepare_pgsql.sh
@@ -30,7 +30,7 @@ echo "Preparing for PostgreSQL ..."
# Print out some PostgreSQL information
psql --version
# Why does this hang further execution of the job?
-#psql -c "SELECT VERSION();" -U postgres
+psql -c "SELECT VERSION();" -U postgres
# Create Hubzilla database
psql -c "DROP DATABASE IF EXISTS hubzilla;" -U postgres