Skip to content

Commit 06a4e07

Browse files
authored
Merge pull request #738 from kmilos/kmilos/ci_msys2
CI: slim down MSYS2 install
2 parents 013ba6d + 0de5302 commit 06a4e07

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

.github/workflows/CI-windows-msys2.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ jobs:
5151
cache: false
5252
msystem: ${{ inputs.msys2-msystem }}
5353
update: false
54-
install: >-
55-
git
56-
base-devel
5754
pacboy: >-
5855
cc:p
5956
gcc-libs:p
@@ -67,12 +64,8 @@ jobs:
6764
- name: Install Additional Dependencies (Coverage)
6865
if: inputs.flavor == 'Coverage'
6966
timeout-minutes: 1
70-
uses: msys2/setup-msys2@v2
71-
with:
72-
cache: false
73-
msystem: ${{ inputs.msys2-msystem }}
74-
pacboy: >-
75-
zstd:p
67+
run: |
68+
pacboy --noconfirm -S --needed zstd:p
7669
- name: Configure
7770
timeout-minutes: 3
7871
env:

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
matrix:
179179
include:
180180
- os: windows-latest
181-
msys2: { msystem: MINGW64, arch: x86_64, family: GNU, CC: gcc, CXX: g++ }
181+
msys2: { msystem: UCRT64, arch: x86_64, family: GNU, CC: gcc, CXX: g++ }
182182
flavor: Coverage
183183
uses: ./.github/workflows/CI-windows-msys2.yml
184184
with:

0 commit comments

Comments
 (0)