Skip to content

Commit 6613a0f

Browse files
committed
CI: remove Perl Strawberry installation
Fixes 32-bit builds, which were picking up libz.a and libssh2.a found in this directory. More information: actions/runner-images#6627
1 parent 863add5 commit 6613a0f

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ jobs:
1919
matrix:
2020
arch: [x86, x64]
2121

22+
defaults:
23+
run:
24+
shell: cmd
25+
2226
steps:
2327
- uses: actions/checkout@v3
2428

@@ -30,10 +34,10 @@ jobs:
3034
# install MSYS packages
3135
install: make autoconf automake libtool pkg-config
3236

33-
- name: Delete MinGW gmake
34-
# delete /c/Strawberry/c/bin/gmake built for MinGW that is found on runners, because we must use make built for MSYS
35-
run: if GMAKE_PATH=`which gmake`; then rm -f "$GMAKE_PATH"; fi
36-
shell: msys2 {0}
37+
- name: Remove Perl Strawberry installation
38+
# this directory contains various MinGW libraries that can get picked up by CMake
39+
# and a MinGW gmake that we cannot use (we must use MSYS make), so we delete it
40+
run: rmdir /S /Q C:\Strawberry
3741

3842
- name: Install Windows packages
3943
run: choco install ninja
@@ -49,7 +53,6 @@ jobs:
4953
:: use msys2.cmd from setup-msys2 as Bash shell, as it doesn't have msys2_shell.cmd used normally by build.bat
5054
set "BASH=msys2 -c"
5155
build.bat
52-
shell: cmd
5356
5457
- name: Package release
5558
run: |

0 commit comments

Comments
 (0)