Skip to content

Commit 7a1d421

Browse files
committed
Add MSYS2 to the PATH to test i686 and x86_64 MinGW
1 parent fc9133d commit 7a1d421

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

.github/workflows/psm.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,17 @@ jobs:
6666
rust_toolchain: [nightly, stable]
6767
rust_target:
6868
- x86_64-pc-windows-gnu
69-
# Only 64 bit GCC is preinstalled
70-
#- i686-pc-windows-gnu
69+
- i686-pc-windows-gnu
7170
steps:
7271
- uses: actions/checkout@v2
72+
- name: Add MSYS2 to the PATH
73+
run: echo "::add-path::c:/msys64/bin"
74+
- name: Add 32-bit mingw-w64 to the PATH
75+
run: echo "::add-path::c:/msys64/mingw32/bin"
76+
if: startsWith(matrix.rust_target, 'i686')
77+
- name: Add 64-bit mingw-w64 to the PATH
78+
run: echo "::add-path::c:/msys64/mingw64/bin"
79+
if: startsWith(matrix.rust_target, 'x86_64')
7380
- name: Install Rust nightly
7481
uses: actions-rs/toolchain@v1
7582
with:

.github/workflows/stacker.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,17 @@ jobs:
4848
rust_toolchain: [nightly, stable]
4949
rust_target:
5050
- x86_64-pc-windows-gnu
51-
# Only 64 bit GCC is preinstalled
52-
#- i686-pc-windows-gnu
51+
- i686-pc-windows-gnu
5352
steps:
5453
- uses: actions/checkout@v2
54+
- name: Add MSYS2 to the PATH
55+
run: echo "::add-path::c:/msys64/bin"
56+
- name: Add 32-bit mingw-w64 to the PATH
57+
run: echo "::add-path::c:/msys64/mingw32/bin"
58+
if: startsWith(matrix.rust_target, 'i686')
59+
- name: Add 64-bit mingw-w64 to the PATH
60+
run: echo "::add-path::c:/msys64/mingw64/bin"
61+
if: startsWith(matrix.rust_target, 'x86_64')
5562
- name: Install Rust nightly
5663
uses: actions-rs/toolchain@v1
5764
with:

0 commit comments

Comments
 (0)