Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ jobs:
APU_CONFIG="--with-crypto --with-ldap"
CLEAR_CACHE=1
# -------------------------------------------------------------------------
- name: APR 1.4.8, APR-util 1.3.12
config: --enable-mods-shared=reallyall
env: |
TEST_APR_TARBALL=yes
APR_VERSION=1.4.8
APU_VERSION=1.3.12
APU_CONFIG="--with-crypto --with-ldap"
# -------------------------------------------------------------------------
- name: Pool-debug
config: --enable-mods-shared=reallyall
env: |
Expand Down
2 changes: 0 additions & 2 deletions changes-entries/pr69954.txt

This file was deleted.

2 changes: 1 addition & 1 deletion modules/md/md_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#else
/* Define a (poor) backwards-compatibility entry point for
* apr_cstr_casecmp() from APR 1.6. */
#define apr_cstr_casecmp apr_strnatcasecmp
#define apr_cstr_casecmp apr_natcasecmp
#endif

struct apr_array_header_t;
Expand Down
45 changes: 29 additions & 16 deletions test/travis_before_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,22 @@ function install_apx() {
local giturl=https://github.com/apache/${name}.git
local config=$3
local buildconf=$4

case $version in
trunk|*.x) ref=refs/heads/${version} ;;
*) ref=refs/tags/${version} ;;
esac

# Fetch the object ID (hash) of latest commit
local commit=`git ls-remote ${giturl} ${ref} | cut -f1`
if test -z "$commit"; then
: Could not determine latest commit hash for ${ref} in ${giturl} - check branch is valid?
exit 1
local commit=tarball

mkdir -p ${HOME}/build

if ! test -v TEST_APR_TARBALL; then
case $version in
trunk|*.x) ref=refs/heads/${version} ;;
*) ref=refs/tags/${version} ;;
esac

# Fetch the object ID (hash) of latest commit
commit=`git ls-remote ${giturl} ${ref} | cut -f1`
if test -z "$commit"; then
: Could not determine latest commit hash for ${ref} in ${giturl} - check branch is valid?
exit 1
fi
fi

# Blow away the cached install root if the cached install is stale
Expand All @@ -50,16 +55,24 @@ function install_apx() {
return 0
fi

git init -q ${build}
pushd $build
if test -v TEST_APR_TARBALL; then
curl https://archive.apache.org/dist/apr/${name}-${version}.tar.gz > apx.tar.gz
tar -C ${HOME}/build -xzf apx.tar.gz
rm apx.tar.gz
pushd ${build}
else
git init -q ${build}
pushd $build
# Clone and checkout the commit identified above.
git remote add origin ${giturl}
git fetch -q --depth=1 origin ${commit}
git checkout ${commit}
./buildconf ${buildconf}
./configure --prefix=${prefix} ${config}
make -j2
make install
fi

./configure --prefix=${prefix} ${config}
make -j2
make install
popd

echo ${version} ${commit} "${config}" "CC=${CC}" > ${HOME}/root/.key-${name}
Expand Down
Loading