Clean up CI an switch to the official installer as base

msys2 · May 30, 2020 · d967ccb · d967ccb
1 parent e5b378f
commit d967ccb
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -19,18 +19,19 @@ jobs:
           BASE_REPO: msys2-ci-base
           ARCH: x86_64
     steps:
+      - powershell: |
+          (New-Object Net.WebClient).DownloadFile("https://github.com/msys2/msys2-installer/releases/download/2020-05-22/msys2-base-x86_64-20200522.sfx.exe", "sfx.exe")
+        displayName: Download MSYS2
       - script: |
-          git clone https://github.com/msys2/$(BASE_REPO).git %CD:~0,2%\$(MSYS_DIR)
-        displayName: Install MSYS2
+          sfx.exe -y -o%CD:~0,2%\
+          %CD:~0,2%\$(MSYS_DIR)\usr\bin\bash -lc "pacman --noconfirm -Syuu"
+          %CD:~0,2%\$(MSYS_DIR)\usr\bin\bash -lc "pacman --noconfirm -Syuu"
+        displayName: Extract/Install/Update MSYS2
       - script: |
-          set PATH=%CD:~0,2%\$(MSYS_DIR)\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-          %CD:~0,2%\$(MSYS_DIR)\usr\bin\pacman --noconfirm -Syyuu
-          %CD:~0,2%\$(MSYS_DIR)\usr\bin\pacman --noconfirm -Syuu
-          %CD:~0,2%\$(MSYS_DIR)\usr\bin\pacman --noconfirm -S p7zip
-        displayName: Update MSYS2
+          %CD:~0,2%\$(MSYS_DIR)\usr\bin\bash -lc "pacman --noconfirm -S p7zip tar"
+        displayName: Install deps
       - script: |
           set CHERE_INVOKING=yes
-          set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
           %CD:~0,2%\$(MSYS_DIR)\usr\bin\bash -lc "bash make-msys2-installer; cp msys2-base-$(ARCH)-[0-9]*.sfx.exe msys2-base-$(ARCH)-latest.sfx.exe; cp msys2-$(ARCH)-[0-9]*.exe msys2-$(ARCH)-latest.exe; cp msys2-*.tar.xz msys2-base-$(ARCH)-latest.tar.xz"
         displayName: CI-Build
       - task: CopyFiles@2