Merge branch 'travis-other-archs' into window-id

Minor fixes for testing PPC/s390 architectures on Travis CI.

See https://github.com/wxWidgets/wxWidgets/pull/1844

.travis.yml

@@ -72,11 +72,23 @@ matrix:
         - os: linux
           arch: ppc64le
           env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 wxSKIP_GUI=1
-          name: wxGTK PowerPC64
+          name: wxBase PowerPC64
         - os: linux
           arch: s390x
           env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 wxSKIP_GUI=1
-          name: wxGTK S/390
+          name: wxBase S/390
+
+    # The environments running these builds are flaky and often fail for the
+    # reasons that have nothing to do with the build itself.
+    allow_failures:
+        - os: linux
+          arch: ppc64le
+          env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 wxSKIP_GUI=1
+          name: wxBase PowerPC64
+        - os: linux
+          arch: s390x
+          env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 wxSKIP_GUI=1
+          name: wxBase S/390
 
 branches:
     only: