Skip to content

Commit 62e6dbd

Browse files
committed
Use bash
1 parent b1e2731 commit 62e6dbd

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

.github/workflows/ci.yml

+17-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
runs-on: "${{ matrix.os }}"
6565
defaults:
6666
run:
67-
shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}
67+
shell: 'bash'
6868
timeout-minutes: 600
6969
env:
7070
CI_JOB_NAME: ${{ matrix.image }}
@@ -80,6 +80,22 @@ jobs:
8080
# Check the `calculate_matrix` job to see how is the matrix defined.
8181
include: ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}
8282
steps:
83+
- if: contains(matrix.os, 'windows') && contains(matrix.name, 'msvc')
84+
uses: msys2/setup-msys2@v2.22.0
85+
with:
86+
# i686 jobs use mingw32. x86_64 and cross-compile jobs use mingw64.
87+
msystem: ${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}
88+
# don't try to download updates for already installed packages
89+
update: false
90+
# don't try to use the msys that comes built-in to the github runner,
91+
# so we can control what is installed (i.e. not python)
92+
release: true
93+
# Inherit the full path from the Windows environment, with MSYS2's */bin/
94+
# dirs placed in front. This lets us run Windows-native Python etc.
95+
path-type: inherit
96+
install: >
97+
make
98+
8399
- name: disable git crlf conversion
84100
run: git config --global core.autocrlf false
85101

0 commit comments

Comments
 (0)