diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2021-04-19 16:48:40 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2021-04-19 19:32:07 -0400 |
| commit | 6ee0a4849dd7d4f90caf4a8a30e11e3704077182 (patch) | |
| tree | dfbcb2e638d48740636fbd29324a8947b9518c3b /.gitlab-ci.yml | |
| parent | b8882324941fd260b0e4a65e83ada766cb5c935b (diff) | |
gitlab-ci: Just skip the msys global upgrade
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7178757..a0c16d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,13 +77,6 @@ build msys2: - 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" - - 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 |