diff options
| author | Joe Orton <jorton@apache.org> | 2020-03-20 12:36:27 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2020-03-20 12:36:27 +0100 |
| commit | 4ee44f04799c5e8e3f21e2397e731adcd1738a30 (patch) | |
| tree | ea90d2b9e730a3cdc149a05e7246c5bb751c4750 /.travis.yml | |
| parent | Match Travis jobs for 2.4.x by tag as well as branch. (diff) | |
| download | apache2-4ee44f04799c5e8e3f21e2397e731adcd1738a30.tar.xz apache2-4ee44f04799c5e8e3f21e2397e731adcd1738a30.zip | |
Test exclsion doesn't work since "tag !~" matches when tag is undefined.
Exclude tests from 2.4.x by explicitly matching against master. Will
have to revisit this for 2.5.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875469 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index c368b6ef50..d558020c8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 or tag !~ /^2.4/ + - if: branch = master 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,14 +143,14 @@ jobs: - libpcre2-dev # ------------------------------------------------------------------------- # MFLAGS= works around https://bz.apache.org/bugzilla/show_bug.cgi?id=63942 - - if: branch != 2.4.x or tag !~ /^2.4/ + - if: branch = master 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 or tag !~ /^2.4/ + - if: branch = master name: Linux Ubuntu, APR trunk env: APR_VERSION=trunk APR_CONFIG="--with-crypto" CONFIG="--enable-mods-shared=reallyall" @@ -217,7 +217,7 @@ jobs: env: APR_VERSION=1.4.8 APU_VERSION=1.4.2 CONFIG="--enable-mods-shared=reallyall" # ------------------------------------------------------------------------- - - if: branch != 2.4.x or tag !~ /^2.4/ + - if: branch = master 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 |