fixup! Add a build definition for Azure DevOps

Some improvements (suggested via review on the Git mailing list) have
not been incorporated into Git for Windows' `master` yet, other changes
were left-overs from debugging that need reverting.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

azure-pipelines.yml

@@ -12,12 +12,11 @@ jobs:
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
 
        sudo apt-get update &&
-       sudo rm /var/lib/apt/lists/lock &&
        sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev apache2-bin &&
 
        export CC=clang || exit 1
 
-       ci/install-dependencies.sh
+       ci/install-dependencies.sh || exit 1
        ci/run-build-and-tests.sh || {
            ci/print-test-failures.sh
            exit 1
@@ -44,11 +43,11 @@ jobs:
   - bash: |
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
 
+       sudo add-apt-repository ppa:ubuntu-toolchain-r/test &&
        sudo apt-get update &&
-       sudo rm /var/lib/apt/lists/lock &&
-       sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev apache2-bin || exit 1
+       sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev apache2 language-pack-is git-svn gcc-8 || exit 1
 
-       ci/install-dependencies.sh
+       ci/install-dependencies.sh || exit 1
        ci/run-build-and-tests.sh || {
            ci/print-test-failures.sh
            exit 1
@@ -77,7 +76,7 @@ jobs:
 
        export CC=clang
 
-       ci/install-dependencies.sh
+       ci/install-dependencies.sh || exit 1
        ci/run-build-and-tests.sh || {
            ci/print-test-failures.sh
            exit 1
@@ -104,7 +103,7 @@ jobs:
   - bash: |
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
 
-       ci/install-dependencies.sh
+       ci/install-dependencies.sh || exit 1
        ci/run-build-and-tests.sh || {
            ci/print-test-failures.sh
            exit 1
@@ -132,7 +131,6 @@ jobs:
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
 
        sudo apt-get update &&
-       sudo rm /var/lib/apt/lists/lock &&
        sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev &&
 
        export jobname=GETTEXT_POISON || exit 1
@@ -157,6 +155,7 @@ jobs:
 
 - job: windows
   displayName: Windows
+  condition: succeeded()
   pool: Hosted
   timeoutInMinutes: 240
   steps:
@@ -275,7 +274,6 @@ jobs:
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
 
        sudo apt-get update &&
-       sudo rm /var/lib/apt/lists/lock &&
        sudo apt-get install -y coccinelle &&
 
        export jobname=StaticAnalysis &&
@@ -296,7 +294,6 @@ jobs:
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
 
        sudo apt-get update &&
-       sudo rm /var/lib/apt/lists/lock &&
        sudo apt-get install -y asciidoc xmlto asciidoctor &&
 
        export ALREADY_HAVE_ASCIIDOCTOR=yes. &&

ci/mount-fileshare.sh

@@ -6,7 +6,7 @@ die () {
 }
 
 test $# = 4 ||
-die "Usage: $0 <share> <username> <password> <mountpoint"
+die "Usage: $0 <share> <username> <password> <mountpoint>"
 
 mkdir -p "$4" || die "Could not create $4"