summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2020-10-21 17:59:55 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2020-10-21 18:43:54 -0400
commitbd8a25eb7db4a787a82be3877978e2ae0876358c (patch)
tree7ab6907dba3fe375ffc8e5fd3ff192c60db1dc47 /.gitlab-ci.yml
parent0c63095c3440c49698f1e5543e8b251598dda80a (diff)
gitlab-ci: Download an updated keyring
The keyring in our base image is outdated.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4f6b90..2aa86b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,12 @@ build msys2:
# For some reason docker build hangs if this is included in the image, needs more troubleshooting
- $env:PATH += ';C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\msys64\mingw32\bin'
+ # It seems that the gpg doesn't like the SSL secured version of the keyserver
- C:\msys64\usr\bin\bash -c "pacman-key --init && pacman-key --populate msys2 && pacman-key --refresh-keys || true"
+ - echo "Download newest msys2 keyring"
+ - C:\msys64\usr\bin\bash -c "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz && pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
+ - C:\msys64\usr\bin\bash -c "pacman-key --init && pacman-key --populate msys2"
+ - C:\msys64\usr\bin\bash -c "pacman-key --refresh-keys || true"
- echo "Updating MSYS2"
- C:\msys64\usr\bin\bash -c "pacman -Syuu --noconfirm || echo Update failed, ignoring"
- echo "Killing all MSYS2 processes"