From 6aabc205f71c44475d364b10f4bcca5fcaf38a7e Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Thu, 25 Jun 2020 03:30:54 +0530
Subject: [PATCH] ci: Workaround MSYS2 update breakage

Also kill all MSYS2 processes after the first update, and constantly
print update status.
---
 azure-pipelines.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f482b8e4a..85fedabdf 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -161,7 +161,13 @@ jobs:
       displayName: Install MSYS2
     - script: |
         set PATH=%MSYS2_ROOT%\usr\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem
-        %MSYS2_ROOT%\usr\bin\pacman --noconfirm -Syyuu
+        # Remove this line when https://github.com/msys2/MSYS2-packages/pull/2022 is merged
+        %MSYS2_ROOT%\usr\bin\pacman --noconfirm -Sy dash
+        echo Updating msys2
+        %MSYS2_ROOT%\usr\bin\pacman --noconfirm -Syuu || echo system update failed, ignoring
+        echo Killing all msys2 processes
+        taskkill /F /FI "MODULES eq msys-2.0.dll"
+        echo Updating msys2 (again)
         %MSYS2_ROOT%\usr\bin\pacman --noconfirm -Syuu
       displayName: Update MSYS2
     - script: |