Match Travis jobs for 2.4.x by tag as well as branch.
Ignore failures for s390x which is flaky in apt-get again.
@@ -97,7 +97,7 @@ jobs:
env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
SKIP_TESTING=1
# -------------------------------------------------------------------------
- - if: branch != 2.4.x
+ - if: branch != 2.4.x or tag !~ /^2.4/
name: Linux Ubuntu, PCRE 1, GCC 7 maintainer-mode w/-Werror
os: linux
env: CONFIG="--enable-mods-shared=reallyall --with-pcre=/usr/bin/pcre-config --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
@@ -143,19 +143,19 @@ jobs:
- libpcre2-dev
# -------------------------------------------------------------------------
# MFLAGS= works around https://bz.apache.org/bugzilla/show_bug.cgi?id=63942
- - if: branch != 2.4.x
+ - if: branch != 2.4.x or tag !~ /^2.4/
name: Linux Ubuntu, Regenerate ap_expr
os: linux
env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror"
BUILDCONFIG="--with-regen-expr"
MFLAGS=
# -------------------------------------------------------------------------
- - if: branch != 2.4.x
+ - if: branch != 2.4.x or tag !~ /^2.4/
name: Linux Ubuntu, APR trunk
env: APR_VERSION=trunk APR_CONFIG="--with-crypto"
CONFIG="--enable-mods-shared=reallyall"
# -------------------------------------------------------------------------
- - if: branch = 2.4.x
+ - if: branch = 2.4.x or tag =~ /^2.4/
name: Linux Ubuntu Xenial, all-modules, system APR/APR-util
os: linux
dist: xenial
@@ -207,20 +207,24 @@ jobs:
- libpcre2-dev
- litmus
# -------------------------------------------------------------------------
- - if: branch = 2.4.x
+ - if: branch = 2.4.x or tag =~ /^2.4/
name: Linux Ubuntu, APR 1.5.1, APR-util 1.5.4
env: APR_VERSION=1.5.1 APU_VERSION=1.5.4
CONFIG="--enable-mods-shared=reallyall"
# -------------------------------------------------------------------------
- - if: branch = 2.4.x
+ - if: branch = 2.4.x or tag =~ /^2.4/
name: Linux Ubuntu, APR 1.4.8, APR-util 1.4.2
env: APR_VERSION=1.4.8 APU_VERSION=1.4.2
CONFIG="--enable-mods-shared=reallyall"
# -------------------------------------------------------------------------
- - if: branch != 2.4.x
+ - if: branch != 2.4.x or tag !~ /^2.4/
name: Linux Ubuntu, UBSan
env: NOTEST_CFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" NOTEST_LIBS=-lubsan
CONFIG="--enable-mods-shared=reallyall --disable-http2" TEST_UBSAN=1
+ allow_failures:
+ # s390x is sometimes flaky
+ - arch: s390x
+ 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
