Merge branch 'sg/ci-libsvn-perl'
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 May 2019 07:45:31 +0000 (16:45 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 May 2019 07:45:31 +0000 (16:45 +0900)
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'

1  2 
ci/install-dependencies.sh
index 52a44c690a7a38850e77eb1525e6f8c56e782369,bab7934b168e288504d35180906ce18da3b55fa8..7f6acdd803c33bc43200804ecec5d99f6d404224
@@@ -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