Merge pull request #738 from kmilos/kmilos/ci_msys2

CI: slim down MSYS2 install
darktable-org · Jun 28, 2024 · 06a4e07 · 06a4e07
2 parents 013ba6d + 0de5302
commit 06a4e07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/.github/workflows/CI-windows-msys2.yml b/.github/workflows/CI-windows-msys2.yml
@@ -51,9 +51,6 @@ jobs:
           cache: false
           msystem: ${{ inputs.msys2-msystem }}
           update: false
-          install: >-
-            git
-            base-devel
           pacboy: >-
             cc:p
             gcc-libs:p
@@ -67,12 +64,8 @@ jobs:
       - name: Install Additional Dependencies (Coverage)
         if: inputs.flavor == 'Coverage'
         timeout-minutes: 1
-        uses: msys2/setup-msys2@v2
-        with:
-          cache: false
-          msystem: ${{ inputs.msys2-msystem }}
-          pacboy: >-
-            zstd:p
+        run: |
+          pacboy --noconfirm -S --needed zstd:p
       - name: Configure
         timeout-minutes: 3
         env:

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -178,7 +178,7 @@ jobs:
       matrix:
         include:
           - os: windows-latest
-            msys2: { msystem: MINGW64, arch: x86_64, family: GNU, CC: gcc, CXX: g++ }
+            msys2: { msystem: UCRT64, arch: x86_64, family: GNU, CC: gcc, CXX: g++ }
             flavor: Coverage
     uses: ./.github/workflows/CI-windows-msys2.yml
     with: