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 2019/11/08 14:29:18 UTC
svn commit: r1869564 - in /httpd/httpd/trunk: .travis.yml
test/travis_before_linux.sh
Author: jorton
Date: Fri Nov 8 14:29:17 2019
New Revision: 1869564
URL: http://svn.apache.org/viewvc?rev=1869564&view=rev
Log:
Add shared-mpms build, add build against APR trunk (httpd trunk only).
Fix handling and ensure safe caching of APR trunk build.
Modified:
httpd/httpd/trunk/.travis.yml
httpd/httpd/trunk/test/travis_before_linux.sh
Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1869564&r1=1869563&r2=1869564&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Fri Nov 8 14:29:17 2019
@@ -32,6 +32,9 @@ matrix:
- name: Linux Ubuntu, Worker MPM, all-modules
env: CONFIG="--enable-mods-shared=reallyall --with-mpm=worker"
# -------------------------------------------------------------------------
+ - name: Linux Ubuntu, Shared MPMs, all-modules
+ env: CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all"
+ # -------------------------------------------------------------------------
- name: Linux Ubuntu Bionic, all-modules
os: linux
dist: bionic
@@ -63,6 +66,11 @@ matrix:
- libnghttp2-dev
- libjansson-dev
# -------------------------------------------------------------------------
+ - if: branch = trunk
+ - name: Linux Ubuntu, APR trunk
+ env: APR_VERSION=trunk APR_CONFIG="--with-crypto"
+ CONFIG="--enable-mods-shared=reallyall"
+ # -------------------------------------------------------------------------
- name: Linux Ubuntu, APR 1.7.0, APR-util 1.6.1
env: APR_VERSION=1.7.0 APU_VERSION=1.6.1
CONFIG="--enable-mods-shared=reallyall"
Modified: httpd/httpd/trunk/test/travis_before_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_before_linux.sh?rev=1869564&r1=1869563&r2=1869564&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_before_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_before_linux.sh Fri Nov 8 14:29:17 2019
@@ -3,21 +3,32 @@ if ! test -v SKIP_TESTING; then
svn export -q https://svn.apache.org/repos/asf/httpd/test/framework/trunk test/perl-framework
fi
if test -v APR_VERSION; then
+ # For APR trunk the cached version at ~/root/apr-trunk will be
+ # stale if the current trunk revision is different from that of
+ # the cached build. Here, cache and check the rev number of the
+ # build accordingly.
+ trunk_url=https://svn.apache.org/repos/asf/apr/apr/trunk
+ if test $APR_VERSION = trunk; then
+ trunk_rev=`svn info --show-item last-changed-revision ${trunk_url}`
+ # Blow away the cached trunk install if the revision does not
+ # match.
+ test -f $HOME/root/apr-trunk/.revision-is-${trunk_rev} || rm -rf $HOME/root/apr-trunk
+ fi
if ! test -d $HOME/root/apr-${APR_VERSION}; then
case $APR_VERSION in
- trunk) url=https://svn.apache.org/repos/asf/apr/apr/trunk ;;
- *) url=https://svn.apache.org/repos/asf/apr/apr/tags/${APR_VERSION} ;;
+ trunk) svn export -q -r ${trunk_rev} ${trunk_url} $HOME/build/apr-trunk ;;
+ *) svn export -q https://svn.apache.org/repos/asf/apr/apr/tags/${APR_VERSION} \
+ $HOME/build/apr-${APR_VERSION} ;;
esac
- svn export -q ${url} $HOME/build/apr-${APR_VERSION}
pushd $HOME/build/apr-${APR_VERSION}
- if [ $APR_VERSION = 1.4.1 ]; then
- # 1.4.1 doesn't build with current libtool
- svn cat https://svn.apache.org/repos/asf/apr/apr/tags/1.5.1/buildconf > buildconf
- fi
./buildconf
./configure ${APR_CONFIG} --prefix=$HOME/root/apr-${APR_VERSION}
make -j2
make install
+ if test -v trunk_rev; then
+ # Record the revision built in the cache.
+ touch $HOME/root/apr-${APR_VERSION}/.revision-is-${trunk_rev}
+ fi
popd
APU_CONFIG="$APU_CONFIG --with-apr=$HOME/root/apr-${APR_VERSION}"
fi