Skip to content

Commit 8a54a65

Browse files
committed
fixup! fixup! fixup! ci(windows/gnu): install mingw via msys2/setup-msys2
1 parent e502d74 commit 8a54a65

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ jobs:
6464
shell: powershell
6565
if: matrix.mingwdir != ''
6666
run: |
67-
choco uninstall -y mingw
6867
# https://github.com/actions/runner-images/issues/5459#issuecomment-1532856844
69-
del C:\Strawberry\c\bin\patch.EXE
68+
Remove-Item -Recurse -Force "C:\mingw64"
69+
Remove-Item -Recurse -Force "C:\Strawberry"
7070
$(
7171
'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
7272
'C:\msys64\usr\bin' + "`r`n"
@@ -212,9 +212,9 @@ jobs:
212212
shell: powershell
213213
if: matrix.mingwdir != ''
214214
run: |
215-
choco uninstall -y mingw
216215
# https://github.com/actions/runner-images/issues/5459#issuecomment-1532856844
217-
del C:\Strawberry\c\bin\patch.EXE
216+
Remove-Item -Recurse -Force "C:\mingw64"
217+
Remove-Item -Recurse -Force "C:\Strawberry"
218218
$(
219219
'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
220220
'C:\msys64\usr\bin' + "`r`n"
@@ -364,9 +364,9 @@ jobs:
364364
shell: powershell
365365
if: matrix.mingwdir != ''
366366
run: |
367-
choco uninstall -y mingw
368367
# https://github.com/actions/runner-images/issues/5459#issuecomment-1532856844
369-
del C:\Strawberry\c\bin\patch.EXE
368+
Remove-Item -Recurse -Force "C:\mingw64"
369+
Remove-Item -Recurse -Force "C:\Strawberry"
370370
$(
371371
'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
372372
'C:\msys64\usr\bin' + "`r`n"

ci/actions-templates/windows-builds-template.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ jobs: # skip-master skip-pr skip-stable
5656
shell: powershell
5757
if: matrix.mingwdir != ''
5858
run: |
59-
choco uninstall -y mingw
6059
# https://github.com/actions/runner-images/issues/5459#issuecomment-1532856844
61-
del C:\Strawberry\c\bin\patch.EXE
60+
Remove-Item -Recurse -Force "C:\mingw64"
61+
Remove-Item -Recurse -Force "C:\Strawberry"
6262
$(
6363
'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
6464
'C:\msys64\usr\bin' + "`r`n"

0 commit comments

Comments
 (0)