Skip to content

Commit 76f2e55

Browse files
authored
Merge pull request #12 from giordano/mg/win32
Install compiler for 32-bit Windows
2 parents c94d265 + c51942e commit 76f2e55

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ jobs:
2626
exclude:
2727
- os: macOS-latest
2828
julia-arch: x86
29-
- os: windows-latest
30-
julia-arch: x86
29+
3130
steps:
3231
- uses: actions/checkout@v2
3332
- uses: julia-actions/setup-julia@v1
@@ -45,16 +44,26 @@ jobs:
4544
${{ runner.os }}-test-${{ env.cache-name }}-
4645
${{ runner.os }}-test-
4746
${{ runner.os }}-
47+
- name: Install gcc-multilib
48+
if: ${{ matrix.os == 'ubuntu-latest' && matrix.julia-arch == 'x86' }}
49+
shell: bash
50+
run: |
51+
sudo apt install -y gcc-multilib
52+
- name: Install i686-w64-mingw32-gcc
53+
if: ${{ matrix.os == 'windows-latest' && matrix.julia-arch == 'x86' }}
54+
shell: bash
55+
run: |
56+
choco install mingw -y --x86 --force --params "/exception:sjlj"
57+
choco install make -y
58+
echo "CC=i686-w64-mingw32-gcc" >> "${GITHUB_ENV}"
59+
- name: Set compiler for 64-bit Windows
60+
if: ${{ matrix.os == 'windows-latest' && matrix.julia-arch == 'x64' }}
61+
shell: bash
62+
run: |
63+
echo "CC=x86_64-w64-mingw32-gcc" >> "${GITHUB_ENV}"
4864
- name: Run tests
4965
shell: julia --color=yes --project=test {0}
5066
run: |
5167
using Pkg
5268
Pkg.instantiate()
53-
# Using GHA to do this kind of setup is too tedious...
54-
if Sys.iswindows()
55-
ENV["CC"] = "x86_64-w64-mingw32-gcc"
56-
end
57-
if Sys.islinux() && Sys.WORD_SIZE == 32
58-
run(`sudo apt install -y gcc-multilib`)
59-
end
6069
include(joinpath(pwd(), "test", "runtests.jl"))

0 commit comments

Comments
 (0)