Skip to content

Commit 6ea5fa2

Browse files
authored
Merge pull request #240 from JuliaMath/vs/msys
Update ci.yml for Windows and msys2
2 parents 9dd3049 + 437c139 commit 6ea5fa2

File tree

1 file changed

+28
-8
lines changed

1 file changed

+28
-8
lines changed

.github/workflows/ci.yml

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88

99
jobs:
1010
build:
11-
1211
runs-on: ${{ matrix.os }}
1312
strategy:
1413
fail-fast: false
@@ -19,13 +18,34 @@ jobs:
1918
- windows-latest
2019
arch:
2120
- x64
22-
- x32
21+
- x86
2322
- armv7
2423
- aarch64
25-
24+
exclude:
25+
- os: windows-latest
26+
arch: aarch64
27+
- os: windows-latest
28+
arch: armv7
29+
- os: windows-latest
30+
arch: x86
31+
- os: macos-latest
32+
arch: armv7
33+
- os: macos-latest
34+
arch: x86
35+
2636
steps:
27-
- uses: actions/checkout@v2
28-
- name: make
29-
run: make
30-
- name: make test
31-
run: make test
37+
- uses: actions/checkout@v2
38+
- name: Install i686-w64-mingw32-gcc
39+
if: ${{ matrix.os == 'windows-latest' && matrix.arch == 'x86' }}
40+
shell: bash
41+
run: |
42+
choco install mingw -y --x86 --force --params "/exception:sjlj"
43+
choco install make -y
44+
echo "CC=i686-w64-mingw32-gcc" >> "${GITHUB_ENV}"
45+
- name: Set compiler for 64-bit Windows
46+
if: ${{ matrix.os == 'windows-latest' && matrix.arch == 'x64' }}
47+
shell: bash
48+
run: |
49+
echo "CC=x86_64-w64-mingw32-gcc" >> "${GITHUB_ENV}"
50+
- name: Build and run tests
51+
run: make && make test

0 commit comments

Comments
 (0)