Merge branch 'travis-fixes' into pmd/5.4.x

.travis.yml

@@ -8,19 +8,10 @@ addons:
 language: java
 jdk: oraclejdk8
 before_install:
+  - bash .travis/setup-secrets.sh
   - bash .travis/install-configure-maven.sh
   - export M2_HOME=$HOME/apache-maven-3.3.9
   - export PATH=$HOME/apache-maven-3.3.9/bin:${PATH}
-  - openssl aes-256-cbc -K $encrypted_5630fbebf057_key -iv $encrypted_5630fbebf057_iv -in .travis/secrets.tar.enc -out .travis/secrets.tar -d
-  - pushd .travis && tar xfv secrets.tar && popd
-  - mkdir -p "$HOME/.ssh"
-  - chmod 700 "$HOME/.ssh"
-  - mv .travis/id_rsa "$HOME/.ssh/id_rsa"
-  - chmod 600 "$HOME/.ssh/id_rsa"
-  - mkdir -p "$HOME/.gpg"
-  - gpg --batch --import .travis/release-signing-key-82DE7BE82166E84E.gpg
-  - rm .travis/secrets.tar
-  - rm .travis/release-signing-key-82DE7BE82166E84E.gpg
 install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
 before_script: true
 script:

.travis/background-job-funcs.sh

@@ -0,0 +1,43 @@
+#
+# Helper functions to run a chatty, long task in the background,
+# redirecting the output to file and keep travis happy by regularly
+# writing to the log.
+#
+# This is to workaround the travis log length limit of 4MB
+# Solution from http://stackoverflow.com/questions/26082444/how-to-work-around-travis-cis-4mb-output-limit/26082445#26082445
+#
+# Source this file into the shell script, that needs it.
+#
+# expected variables
+# Name          |   Example Value
+# PING_SLEEP    |   30s
+# BUILD_OUTPUT  |   /tmp/build-step-logfile.out
+# PING_PID_FILE |   /tmp/build-step-ping.pid
+
+touch $BUILD_OUTPUT
+
+dump_output() {
+   echo Tailing the last 100 lines of output:
+   tail -100 $BUILD_OUTPUT
+}
+kill_ping() {
+  if [ -e $PING_PID_FILE ]; then
+    PING_LOOP_PID=$(cat $PING_PID_FILE)
+    kill $PING_LOOP_PID
+    rm $PING_PID_FILE
+  fi
+}
+error_handler() {
+  kill_ping
+  echo ERROR: An error was encountered with the build.
+  dump_output
+  exit 1
+}
+# If an error occurs, run our error handler to output a tail of the build
+trap 'error_handler' ERR
+
+# Set up a repeating loop to send some output to Travis.
+bash -c "while true; do echo \$(date) - building ...; sleep $PING_SLEEP; done" &
+PING_LOOP_PID=$!
+echo "$PING_LOOP_PID" > $PING_PID_FILE
+

.travis/build-push.sh

@@ -5,11 +5,19 @@ VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non
 echo "Building PMD ${VERSION} on branch ${TRAVIS_BRANCH}"
 
 if [[ "$VERSION" != *-SNAPSHOT && "$TRAVIS_TAG" != "" ]]; then
+    # release build
     mvn deploy -Possrh,pmd-release -B -V
-else
+elif [[ "$VERSION" == *-SNAPSHOT ]]; then
+    # snapshot build
     mvn deploy -Possrh -B -V
+else
+    # other build. Can happen during release: the commit with a non snapshot version is built, but not from the tag.
+    mvn verify -Possrh -B -V
+    # we stop here - no need to execute further steps
+    exit 0
 fi
 
+
 bash .travis/build-site.sh
 
 # create pmd-doc archive
@@ -33,6 +41,6 @@ fi
 
 if [[ "$VERSION" == *-SNAPSHOT && "$TRAVIS_BRANCH" == "master" ]]; then
     # only do a clean build for sonar, if we are executing a snapshot build, otherwise we can't reuse the build from above for the release
-    mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarqube.com -Dsonar.login=${SONAR_TOKEN} -B -V
+    bash .travis/build-sonar.sh
 fi
 

.travis/build-site.sh

@@ -1,41 +1,11 @@
 #!/bin/bash
 set -ev
 
-# Do not log the output, to avoid the travis log length limit of 4MB
-# Solution from http://stackoverflow.com/questions/26082444/how-to-work-around-travis-cis-4mb-output-limit/26082445#26082445
-
-
-
 export PING_SLEEP=30s
 export BUILD_OUTPUT=/tmp/build-site.out
 export PING_PID_FILE=/tmp/build-site-ping.pid
 
-touch $BUILD_OUTPUT
-
-dump_output() {
-   echo Tailing the last 500 lines of output:
-   tail -500 $BUILD_OUTPUT  
-}
-kill_ping() {
-  if [ -e $PING_PID_FILE ]; then
-    PING_LOOP_PID=$(cat $PING_PID_FILE)
-    kill $PING_LOOP_PID
-    rm $PING_PID_FILE
-  fi
-}
-error_handler() {
-  kill_ping
-  echo ERROR: An error was encountered with the build.
-  dump_output
-  exit 1
-}
-# If an error occurs, run our error handler to output a tail of the build
-trap 'error_handler' ERR
-
-# Set up a repeating loop to send some output to Travis.
-bash -c "while true; do echo \$(date) - building ...; sleep $PING_SLEEP; done" &
-PING_LOOP_PID=$!
-echo "$PING_LOOP_PID" > $PING_PID_FILE
+source .travis/background-job-funcs.sh
 
 # Run the build, redirect output into the file
 mvn site site:stage -Psite -B -V >> $BUILD_OUTPUT 2>&1

.travis/build-sonar.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -ev
+
+export PING_SLEEP=30s
+export BUILD_OUTPUT=/tmp/build-sonar.out
+export PING_PID_FILE=/tmp/build-sonar-ping.pid
+
+source .travis/background-job-funcs.sh
+
+# Run the build, redirect output into the file
+mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarqube.com -Dsonar.login=${SONAR_TOKEN} -B -V >> $BUILD_OUTPUT 2>&1
+
+# The build finished without returning an error so dump a tail of the output
+dump_output
+
+# nicely terminate the ping output loop
+kill_ping
+

.travis/setup-secrets.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -ev
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ "${TRAVIS_SECURE_ENV_VARS}" != "true" ]; then
+    echo "Not setting up secrets (TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST} TRAVIS_SECURE_ENV_VARS=${TRAVIS_SECURE_ENV_VARS})."
+    exit 0
+fi
+
+
+openssl aes-256-cbc -K $encrypted_5630fbebf057_key -iv $encrypted_5630fbebf057_iv -in .travis/secrets.tar.enc -out .travis/secrets.tar -d
+pushd .travis && tar xfv secrets.tar && popd
+mkdir -p "$HOME/.ssh"
+chmod 700 "$HOME/.ssh"
+mv .travis/id_rsa "$HOME/.ssh/id_rsa"
+chmod 600 "$HOME/.ssh/id_rsa"
+mkdir -p "$HOME/.gpg"
+gpg --batch --import .travis/release-signing-key-82DE7BE82166E84E.gpg
+rm .travis/secrets.tar
+rm .travis/release-signing-key-82DE7BE82166E84E.gpg