Skip to content

Commit

Permalink
Use 'git clone' rather than 'svn export' in CI scripts.
Browse files Browse the repository at this point in the history
Drop unused run_svn_export.
Run git clone with -q throughout.

Github: closes #368


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1910790 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
notroj committed Jul 5, 2023
1 parent cc0735d commit 6e1ef69
Showing 1 changed file with 3 additions and 32 deletions.
35 changes: 3 additions & 32 deletions test/travis_before_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,42 +21,13 @@ if grep ip6-localhost /etc/hosts; then
cat /etc/hosts
fi

# Use a rudimental retry workflow as workaround to svn export hanging for minutes.
# Travis automatically kills a build if one step takes more than 10 minutes without
# reporting any progress.
function run_svn_export() {
local url=$1
local revision=$2
local dest_dir=$3
local max_tries=$4

# Disable -e to allow fail/retry
set +e

for i in $(seq 1 $max_tries)
do
timeout 60 svn export -r ${revision} --force -q $url $dest_dir
if [ $? -eq 0 ]; then
break
else
if [ $i -eq $max_tries ]; then
exit 1
else
sleep $((100 * i))
fi
fi
done

# Restore -e behavior after fail/retry
set -e
}

function install_apx() {
local name=$1
local version=$2
local root=https://svn.apache.org/repos/asf/apr/${name}
local prefix=${HOME}/root/${name}-${version}
local build=${HOME}/build/${name}-${version}
local giturl=https://github.com/apache/${name}.git
local config=$3
local buildconf=$4

Expand All @@ -81,7 +52,7 @@ function install_apx() {
return 0
fi

svn export -q -r ${revision} ${url} ${build}
git clone -q --depth=1 --branch=$version ${giturl} ${build}
pushd $build
./buildconf ${buildconf}
./configure --prefix=${prefix} ${config}
Expand Down Expand Up @@ -117,7 +88,7 @@ if ! test -v SKIP_TESTING; then
unset pkgs

# Make a shallow clone of httpd-tests git repo.
git clone --depth=1 https://github.com/apache/httpd-tests.git test/perl-framework
git clone -q --depth=1 https://github.com/apache/httpd-tests.git test/perl-framework
fi

# For LDAP testing, run slapd listening on port 8389 and populate the
Expand Down

0 comments on commit 6e1ef69

Please sign in to comment.