ci(windows-build.yml): improve msys2 setup

use UCRT64 as msystem, which is recommended by msys2.
rime · Oct 3, 2023 · 6a50750 · 6a50750
1 parent f8cfa80
commit 6a50750
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
@@ -138,26 +138,31 @@ jobs:
         shell: msys2 {0}
 
     steps:
-      - name: Setup MSYS2
+      - name: Setup msys2 and install dependencies
         uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          msystem: UCRT64
+          install: >-
+            git
+            base-devel
+            mingw-w64-x86_64-boost
+            mingw-w64-x86_64-glog
+            mingw-w64-x86_64-gtest
+            mingw-w64-x86_64-yaml-cpp
+            mingw-w64-x86_64-leveldb
+            mingw-w64-x86_64-marisa
+            mingw-w64-x86_64-opencc
+          pacboy: >-
+            toolchain:p
+            cmake:p
+            ninja:p
 
       - name: Checkout last commit
         uses: actions/checkout@v4
         with:
           repository: ${{ inputs.repository }}
-
-      - name: Install dependencies
-        run: |
-          pacman -S --noconfirm git base-devel mingw-w64-x86_64-toolchain ninja \
-            mingw64/mingw-w64-x86_64-cmake \
-            mingw-w64-x86_64-boost \
-            mingw-w64-x86_64-glog \
-            mingw-w64-x86_64-gtest \
-            mingw-w64-x86_64-yaml-cpp \
-            mingw-w64-x86_64-leveldb \
-            mingw-w64-x86_64-marisa \
-            mingw-w64-x86_64-opencc
-
+
       - name: Configure build environment
         run: |
           echo git_ref_name="$(git describe --always)" >> $GITHUB_ENV