diff options
| author | Joe Orton <jorton@apache.org> | 2020-03-20 12:56:58 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2020-03-20 12:56:58 +0100 |
| commit | 29963fd27965c9210f9b3c92b33cf68b29475640 (patch) | |
| tree | bd8c0d16c3a19c86f539ad5195918ca1b4fcc14f | |
| parent | Test exclsion doesn't work since "tag !~" matches when tag is undefined. (diff) | |
| download | apache2-29963fd27965c9210f9b3c92b33cf68b29475640.tar.xz apache2-29963fd27965c9210f9b3c92b33cf68b29475640.zip | |
Fix Travis trunk/master confusion, and make the i386 build
trunk-only, it has not been adjusted to find PCRE "v1" i386 packages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875471 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index d558020c8c..4c85ebd367 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ jobs: env: CONFIG="--enable-mods-shared=reallyall" TEST_ARGS="-v" # ------------------------------------------------------------------------- + - if: branch = trunk - name: Linux i386 Ubuntu, Shared MPMs, most modules, maintainer-mode w/-Werror env: CONFIG="--enable-mods-shared=reallyall --disable-xml2enc --disable-proxy-html --enable-mpms-shared=all --enable-maintainer-mode" PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig" @@ -97,7 +98,7 @@ jobs: env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7" SKIP_TESTING=1 # ------------------------------------------------------------------------- - - if: branch = master + - if: branch = trunk 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 +144,14 @@ jobs: - libpcre2-dev # ------------------------------------------------------------------------- # MFLAGS= works around https://bz.apache.org/bugzilla/show_bug.cgi?id=63942 - - if: branch = master + - if: branch = trunk 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 = master + - if: branch = trunk name: Linux Ubuntu, APR trunk env: APR_VERSION=trunk APR_CONFIG="--with-crypto" CONFIG="--enable-mods-shared=reallyall" @@ -217,7 +218,7 @@ jobs: env: APR_VERSION=1.4.8 APU_VERSION=1.4.2 CONFIG="--enable-mods-shared=reallyall" # ------------------------------------------------------------------------- - - if: branch = master + - if: branch = trunk 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 |