Skip to content

Commit 4d16911

Browse files
committed
azure-pipeline: stop hard-coding apt-get calls
We have `ci/install-dependencies.sh` for that. Incidentally, this avoids the following error in the linux-* jobs: The following packages have unmet dependencies: git-email : Depends: git (< 1:2.25.1-.) but 1:2.35.1-0ppa1~ubuntu20.04.1 is to be installed Recommends: libemail-valid-perl but it is not going to be installed Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 5bb40aa commit 4d16911

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

azure-pipelines.yml

-7
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,6 @@ jobs:
303303
- bash: |
304304
test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
305305
306-
sudo apt-get update &&
307-
sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev apache2-bin &&
308-
309306
export CC=clang || exit 1
310307
311308
ci/install-dependencies.sh || exit 1
@@ -342,10 +339,6 @@ jobs:
342339
- bash: |
343340
test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
344341
345-
sudo add-apt-repository ppa:ubuntu-toolchain-r/test &&
346-
sudo apt-get update &&
347-
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
348-
349342
ci/install-dependencies.sh || exit 1
350343
ci/run-build-and-tests.sh || {
351344
ci/print-test-failures.sh

0 commit comments

Comments
 (0)