From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 May 2019 07:45:31 +0000 (+0900)
Subject: Merge branch 'sg/ci-libsvn-perl'
X-Git-Tag: v2.22.0-rc1~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6f3d93f7ac116ffb32c83581567b0b38b19649db?hp=-c

Merge branch 'sg/ci-libsvn-perl'

To run tests for Git SVN, our scripts for CI used to install the
git-svn package (in the hope that it would bring in the right
dependencies).  This has been updated to install the more direct
dependency, namely, libsvn-perl.

* sg/ci-libsvn-perl:
ci: install 'libsvn-perl' instead of 'git-svn'
---

6f3d93f7ac116ffb32c83581567b0b38b19649db
diff --combined ci/install-dependencies.sh
index 52a44c690a,bab7934b16..7f6acdd803
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@@ -12,7 -12,7 +12,7 @@@ case "$jobname" i
  linux-clang|linux-gcc)
  	sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
  	sudo apt-get -q update
- 	sudo apt-get -q -y install language-pack-is git-svn apache2
+ 	sudo apt-get -q -y install language-pack-is libsvn-perl apache2
  	case "$jobname" in
  	linux-gcc)
  		sudo apt-get -q -y install gcc-8
@@@ -54,9 -54,6 +54,9 @@@ StaticAnalysis
  Documentation)
  	sudo apt-get -q update
  	sudo apt-get -q -y install asciidoc xmlto
 +
 +	test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
 +	gem install --version 1.5.8 asciidoctor
  	;;
  esac