From 01696a11855bef4f51071db1a5919dfc5bea2515 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 30 Aug 2022 13:00:54 +1200 Subject: [PATCH] [ci] Drop msys2 keyring workaround This now breaks because the hard-coded keyring version it tries to fetch is no longer in the repo, but it no longer seems to be required (presumably appveyor have updated their image to fix the problem). (cherry picked from commit 6d32e27a91c510e96d6f52c9ad4f09179e6edfcf) --- .appveyor.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 52574d8df..3857eb8bc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -99,11 +99,6 @@ install: } - if "%TOOLCHAIN%"=="mingw" bash -c "echo 'c:/mingw /mingw' >> /etc/fstab" - if "%TOOLCHAIN%"=="mingw" appveyor-retry bash -c 'mingw-get install libz-dev' - # Workaround appveyor's container having old maintainer keys: - - if "%TOOLCHAIN%"=="mingw64" appveyor-retry bash -c 'curl -O https://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz' - - if "%TOOLCHAIN%"=="mingw64" appveyor-retry bash -c 'curl -O https://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig' - - if "%TOOLCHAIN%"=="mingw64" appveyor-retry bash -c 'pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig' - - if "%TOOLCHAIN%"=="mingw64" appveyor-retry bash -c 'pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz' - if "%TOOLCHAIN%"=="mingw64" appveyor-retry bash -c 'pacman -Sy --noconfirm zlib-devel' # Work around odd ownership of directories in CI build image. - if "%TOOLCHAIN%"=="cygwin" bash -c 'git config --global --add safe.directory /cygdrive/c/projects/xapian' -- 2.11.4.GIT