You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2020/03/20 12:16:00 UTC
svn commit: r1875474 - in /httpd/httpd/branches/2.4.x: ./ .travis.yml
Author: jorton
Date: Fri Mar 20 12:15:59 2020
New Revision: 1875474
URL: http://svn.apache.org/viewvc?rev=1875474&view=rev
Log:
Merge r1875471, r1875472 from trunk:
Fix Travis trunk/master confusion, and make the i386 build
trunk-only, it has not been adjusted to find PCRE "v1" i386 packages.
Fix the travis syntax (should have done it in a PR...).
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/.travis.yml
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1875471-1875472
Modified: httpd/httpd/branches/2.4.x/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/.travis.yml?rev=1875474&r1=1875473&r2=1875474&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/.travis.yml (original)
+++ httpd/httpd/branches/2.4.x/.travis.yml Fri Mar 20 12:15:59 2020
@@ -47,7 +47,8 @@ jobs:
env: CONFIG="--enable-mods-shared=reallyall"
TEST_ARGS="-v"
# -------------------------------------------------------------------------
- - name: Linux i386 Ubuntu, Shared MPMs, most modules, maintainer-mode w/-Werror
+ - 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"
NOTEST_CFLAGS="-Werror"
@@ -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