diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2020-06-25 14:36:27 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2020-10-21 18:43:51 -0400 |
| commit | d883bbf9e6b461c01f9728874fd66f870b987d44 (patch) | |
| tree | a167a801b7df57f9e76de91652e638514b627c1e /.gitlab-ci.yml | |
| parent | d88876664c17030fa062ee5c711ab70c60cac514 (diff) | |
gitlab-ci: Kill all msys tasks after upgrading
Also don't fail the first iteration of upgrade
Solution found by Jordan Petritis
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b628829..eb35305 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,13 @@ 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' - C:\msys64\usr\bin\bash -c "pacman-key --init && pacman-key --populate msys2 && pacman-key --refresh-keys || true" - - C:\msys64\usr\bin\bash -c "pacman -Syuu --noconfirm" + - echo "Updating MSYS2" + - C:\msys64\usr\bin\bash -c "pacman -Syuu --noconfirm || echo Update failed, ignoring" + - echo "Killing all MSYS2 processes" + - taskkill /F /FI "MODULES eq msys-2.0.dll" + - echo "Completing MSYS2 update" + - C:\msys64\usr\bin\bash -c "pacman -Suu --noconfirm" + - echo "Installing needed MSYS2 packages" - C:\msys64\usr\bin\bash -c "pacman -Sy --noconfirm --needed mingw-w64-x86_64-toolchain ninja" # For some reason, options are separated by newline instead of space, so we |