From: Joe Orton <jorton@apache.org>
Date: Tue, 14 Apr 2020 07:44:15 +0000 (+0000)
Subject: Merge r1875923, r1876479 from trunk:
X-Git-Tag: 2.4.44~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bd899af9105a3f27cee1db3224859bd31bfc08f;p=thirdparty%2Fapache%2Fhttpd.git

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 65a90cf92df..0f7422b1b12 100644
--- 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 3d9550169da..41c500f32d4 100755
--- 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.