Merge r1875923, r1876479 from trunk:

For future debugging ease, output the Travis tag & branch.

Don't fail the Travis build for ppc64le jobs, which are also unreliable.

e.g. https://travis-ci.org/github/apache/httpd/jobs/670727360

[under CTR for Travis-specific changes]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876481 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.travis.yml b/.travis.yml
index 65a90cf92df930dd3b5f3e4ec78d325299997e8b..0f7422b1b1295f896e4a29194eb73b79a9d73970 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -234,6 +234,8 @@ jobs:
       env: CONFIG="--enable-mods-shared=reallyall"
     - arch: arm64
       env: CONFIG="--enable-mods-shared=reallyall"
+    - arch: ppc64le
+      env: CONFIG="--enable-mods-shared=reallyall"
            
 # CPAN modules are to be used with the system Perl and always with
 # CC=gcc, e.g. for the CC="gcc -m32" case the builds are not correct

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 3d9550169da0cb3651e6a00d7c27ced6f233a2d6..41c500f32d48af9b41ab9660601f264e0f69c42c 100755 (executable)
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -4,6 +4,9 @@ if test -v CLEAR_CACHE; then
     rm -rf $HOME/root
 fi
 
+: Travis tag = ${TRAVIS_TAG}
+: Travis branch = ${TRAVIS_BRANCH}
+
 # Use a rudimental retry workflow as workaround to svn export hanging for minutes.
 # Travis automatically kills a build if one step takes more than 10 minutes without
 # reporting any progress.