summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Ekström <jeebjp@gmail.com>2020-10-16 00:59:07 +0300
committerJames Ross-Gowan <rossy@jrg.systems>2020-10-16 22:35:54 +1100
commit60e2f424321cf0229242a5a0405713495e37a654 (patch)
treebec869d0bf735c657ac53256a01367e4e9f98c14
parent9a1942ac95484a277239de1068801342754c079a (diff)
downloadmpv-appveyor.tar.bz2
mpv-appveyor.tar.xz
ci/appveyor: attempt to work around outdated msys2appveyor
Based on the workarounds utilized in the MAME project: 1. mamedev/mame@4b4016110a71a5b84b9d19faf20238d20926088d 2. mamedev/mame@2d1bf3ed5cb1f4cdcc40b286a78c24f398217535 Co-authored-by: James Ross-Gowan <rossy@jrg.systems>
-rw-r--r--appveyor.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 1b272a5f96..92f229aa3a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,6 +15,12 @@ shallow_clone: true
test: off
install:
+ # Work around age/brokenness of Appveyor's msys2 by adding the new
+ # maintainer's keyring.
+ - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
+ - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
+ - bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
+ - bash -lc "pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
# Support for Ada and Objective-C was removed from MSYS2. GCC won't update if
# these packages are installed.
- >-
@@ -23,6 +29,8 @@ install:
mingw-w64-x86_64-gcc-objc
# Update core packages
- C:\msys64\usr\bin\pacman -Syyuu --noconfirm --noprogressbar --ask=20
+ # Explicitly kill any remaining msys2 processes after core update
+ - taskkill /f /fi "MODULES eq msys-2.0.dll"
# Update non-core packages
- C:\msys64\usr\bin\pacman -Suu --noconfirm --noprogressbar --ask=20
# Install required MSYS2 packages