Skip to content

Commit 47abc4b

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 47abc4b

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

.github/workflows/ci.yml

Lines changed: 11 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,13 @@ 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+
# C:\Strawberry contains various MinGW libraries and binaries like pkg-config
39+
# that can get picked up by configure/CMake and don't necessarily behave
40+
# correctly when not using a MinGW environment, and more specifically we cannot
41+
# use MinGW gmake but must use MSYS make for correctly handling of Windows paths,
42+
# so we delete everything that could mess up our builds
43+
run: rmdir /S /Q C:\Strawberry
3744

3845
- name: Install Windows packages
3946
run: choco install ninja
@@ -49,7 +56,6 @@ jobs:
4956
:: use msys2.cmd from setup-msys2 as Bash shell, as it doesn't have msys2_shell.cmd used normally by build.bat
5057
set "BASH=msys2 -c"
5158
build.bat
52-
shell: cmd
5359
5460
- name: Package release
5561
run: |

0 commit comments

Comments
 (0)