Skip to content

Commit 1f3928c

Browse files
committed
ci(windows/gnu): use *-pc-windows-gnu as the default host triple
1 parent 99a4df7 commit 1f3928c

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.github/workflows/ci.yaml

+7-3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
- target: x86_64-pc-windows-msvc
3838
run_tests: YES
3939
- target: x86_64-pc-windows-gnu
40+
host: x86_64-pc-windows-gnu
4041
mingwdir: mingw64
4142
lto: off
4243
steps:
@@ -99,7 +100,7 @@ jobs:
99100
# Disable the download progress bar which can cause perf issues
100101
$ProgressPreference = "SilentlyContinue"
101102
Invoke-WebRequest https://win.rustup.rs/ -OutFile rustup-init.exe
102-
.\rustup-init.exe -y --default-host=x86_64-pc-windows-msvc --profile=minimal
103+
.\rustup-init.exe -y --default-host=${{ matrix.host != '' && matrix.host || 'x86_64-pc-windows-msvc' }} --profile=minimal
103104
del rustup-init.exe
104105
shell: powershell
105106
- name: Ensure stable toolchain is up to date
@@ -178,6 +179,7 @@ jobs:
178179
- target: x86_64-pc-windows-msvc
179180
run_tests: YES
180181
- target: x86_64-pc-windows-gnu
182+
host: x86_64-pc-windows-gnu
181183
mingwdir: mingw64
182184
lto: off
183185
steps:
@@ -240,7 +242,7 @@ jobs:
240242
# Disable the download progress bar which can cause perf issues
241243
$ProgressPreference = "SilentlyContinue"
242244
Invoke-WebRequest https://win.rustup.rs/ -OutFile rustup-init.exe
243-
.\rustup-init.exe -y --default-host=x86_64-pc-windows-msvc --profile=minimal
245+
.\rustup-init.exe -y --default-host=${{ matrix.host != '' && matrix.host || 'x86_64-pc-windows-msvc' }} --profile=minimal
244246
del rustup-init.exe
245247
shell: powershell
246248
- name: Ensure stable toolchain is up to date
@@ -321,9 +323,11 @@ jobs:
321323
- target: x86_64-pc-windows-msvc
322324
run_tests: YES
323325
- target: x86_64-pc-windows-gnu
326+
host: x86_64-pc-windows-gnu
324327
mingwdir: mingw64
325328
lto: off
326329
- target: i686-pc-windows-gnu # skip-pr skip-master
330+
host: x86_64-pc-windows-gnu # skip-pr skip-master
327331
mingwdir: mingw32 # skip-pr skip-master
328332
lto: off # skip-pr skip-master
329333
steps:
@@ -386,7 +390,7 @@ jobs:
386390
# Disable the download progress bar which can cause perf issues
387391
$ProgressPreference = "SilentlyContinue"
388392
Invoke-WebRequest https://win.rustup.rs/ -OutFile rustup-init.exe
389-
.\rustup-init.exe -y --default-host=x86_64-pc-windows-msvc --profile=minimal
393+
.\rustup-init.exe -y --default-host=${{ matrix.host != '' && matrix.host || 'x86_64-pc-windows-msvc' }} --profile=minimal
390394
del rustup-init.exe
391395
shell: powershell
392396
- name: Ensure stable toolchain is up to date

ci/actions-templates/windows-builds-template.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ jobs: # skip-master skip-pr skip-stable
2727
- target: x86_64-pc-windows-msvc
2828
run_tests: YES
2929
- target: x86_64-pc-windows-gnu
30+
host: x86_64-pc-windows-gnu
3031
mingwdir: mingw64
3132
lto: off
3233
- target: i686-pc-windows-gnu # skip-pr skip-master
34+
host: x86_64-pc-windows-gnu # skip-pr skip-master
3335
mingwdir: mingw32 # skip-pr skip-master
3436
lto: off # skip-pr skip-master
3537
steps:
@@ -92,7 +94,7 @@ jobs: # skip-master skip-pr skip-stable
9294
# Disable the download progress bar which can cause perf issues
9395
$ProgressPreference = "SilentlyContinue"
9496
Invoke-WebRequest https://win.rustup.rs/ -OutFile rustup-init.exe
95-
.\rustup-init.exe -y --default-host=x86_64-pc-windows-msvc --profile=minimal
97+
.\rustup-init.exe -y --default-host=${{ matrix.host != '' && matrix.host || 'x86_64-pc-windows-msvc' }} --profile=minimal
9698
del rustup-init.exe
9799
shell: powershell
98100
- name: Ensure stable toolchain is up to date

0 commit comments

Comments
 (0)