From 3f1df651736af34468d1926388de1e498b1d2847 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 4 Nov 2020 17:57:26 +0100
Subject: [PATCH] MSYS2's CI repository is no more

---
 azure-pipelines.yml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bbc4d55c..6a161eb5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -66,14 +66,17 @@ jobs:
     pool:
       vmImage: "windows-2019"
     steps:
-      - script: |
-          git clone https://github.com/msys2/msys2-ci-base.git %CD:~0,2%\msys64
-          %CD:~0,2%\msys64\usr\bin\rm -rf %CD:~0,2%\msys64\.git
+      - powershell: |
+          (New-Object Net.WebClient).DownloadFile("https://github.com/msys2/msys2-installer/releases/download/2020-09-03/msys2-base-x86_64-20200903.sfx.exe", "sfx.exe")
+          .\sfx.exe -y -o\
+          del sfx.exe
         displayName: Install MSYS2
       - script: |
           set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-          %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu
-          %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syuu
+          %CD:~0,2%\msys64\usr\bin\bash -lc
+          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Sydd filesystem"
+          %CD:~0,2%\msys64\usr\bin\bash -lc 'pacman --noconfirm -Syuu'
+          %CD:~0,2%\msys64\usr\bin\bash -lc 'pacman --noconfirm -Syuu'
         displayName: Update MSYS2
       - script: |
           set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
@@ -85,6 +88,7 @@ jobs:
           set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\bin
           set MSYS2_ROOT=%CD:~0,2%\msys64
           set MSYSTEM=MINGW64
+          set CHERE_INVOKING=yes
           %MSYS2_ROOT%\cmd\msystem MINGW64
           %CD:~0,2%\msys64\usr\bin\bash -lc dist-build/msys2-win64.sh
         env:
@@ -101,14 +105,17 @@ jobs:
     pool:
       vmImage: "windows-2019"
     steps:
-      - script: |
-          git clone https://github.com/msys2/msys2-ci-base.git %CD:~0,2%\msys64
-          %CD:~0,2%\msys64\usr\bin\rm -rf %CD:~0,2%\msys64\.git
+      - powershell: |
+          (New-Object Net.WebClient).DownloadFile("https://github.com/msys2/msys2-installer/releases/download/2020-09-03/msys2-base-x86_64-20200903.sfx.exe", "sfx.exe")
+          .\sfx.exe -y -o\
+          del sfx.exe
         displayName: Install MSYS2
       - script: |
           set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-          %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu
-          %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syuu
+          %CD:~0,2%\msys64\usr\bin\bash -lc
+          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Sydd filesystem"
+          %CD:~0,2%\msys64\usr\bin\bash -lc 'pacman --noconfirm -Syuu'
+          %CD:~0,2%\msys64\usr\bin\bash -lc 'pacman --noconfirm -Syuu'
         displayName: Update MSYS2
       - script: |
           set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
@@ -120,6 +127,7 @@ jobs:
           set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\bin
           set MSYS2_ROOT=%CD:~0,2%\msys64
           set MSYSTEM=MINGW32
+          set CHERE_INVOKING=yes
           %MSYS2_ROOT%\cmd\msystem MINGW32
           %CD:~0,2%\msys64\usr\bin\bash -lc dist-build/msys2-win32.sh
         env: