summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2020-07-25 23:20:29 +0200
committer GitHub <noreply@github.com>2020-07-25 17:20:29 -0400
commit4b4016110a71a5b84b9d19faf20238d20926088d (patch)
tree0cdbde05bbd77c93784b6d18db36036026f324f7
parent608e74ec09eb4fec25e1d45aae3b66e28311e65e (diff)
Appveyor msys2 workaround (#7002)
* Work around appveyor not being able to update msys2 There has been a change to msys2 package maintainers, meaning that the packages are now signed with a different key: https://www.msys2.org/news/#2020-06-29-new-packagers Import the new keys manually until appveyor image is updated with a new msys2-keyring package * Explicitly kill msys2 before the second pacman call
-rw-r--r--.appveyor.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index be4beda5918..65fab2f279a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -35,7 +35,12 @@ for:
install:
- set "PATH=C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\System32;C:\Windows;%PATH%"
- set MSYSTEM=MINGW64
+ - 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 msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
+ - bash -lc "pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
- bash -lc "pacman -Syu --noconfirm"
+ - taskkill /f /fi "MODULES eq msys-2.0.dll"
- bash -lc "pacman -Syu --noconfirm"
build_script:
- bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && export MINGW64=/mingw64 && make SUBTARGET=tiny PTR64=1 TOOLS=1 OPTIMIZE=3 IGNORE_GIT=1 -j3"