ci(windows/gnu): use *-pc-windows-gnu as the default host triple

rust-lang · May 31, 2024 · b573580 · b573580
1 parent 99a4df7
commit b573580
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -37,6 +37,7 @@ jobs:
           - target: x86_64-pc-windows-msvc
             run_tests: YES
           - target: x86_64-pc-windows-gnu
+            host: x86_64-pc-windows-gnu
             mingwdir: mingw64
             lto: off
     steps:
@@ -99,11 +100,13 @@ jobs:
           # Disable the download progress bar which can cause perf issues
           $ProgressPreference = "SilentlyContinue"
           Invoke-WebRequest https://win.rustup.rs/ -OutFile rustup-init.exe
-          .\rustup-init.exe -y --default-host=x86_64-pc-windows-msvc --profile=minimal
+          .\rustup-init.exe -y --default-host=${{ matrix.host != '' && matrix.host || 'x86_64-pc-windows-msvc' }} --profile=minimal
           del rustup-init.exe
         shell: powershell
       - name: Ensure stable toolchain is up to date
-        run: rustup update stable
+        run: |
+          rustup update stable
+          rustup default stable
         shell: bash
       - name: Install the target
         run: |
@@ -178,6 +181,7 @@ jobs:
           - target: x86_64-pc-windows-msvc
             run_tests: YES
           - target: x86_64-pc-windows-gnu
+            host: x86_64-pc-windows-gnu
             mingwdir: mingw64
             lto: off
     steps:
@@ -240,11 +244,13 @@ jobs:
           # Disable the download progress bar which can cause perf issues
           $ProgressPreference = "SilentlyContinue"
           Invoke-WebRequest https://win.rustup.rs/ -OutFile rustup-init.exe
-          .\rustup-init.exe -y --default-host=x86_64-pc-windows-msvc --profile=minimal
+          .\rustup-init.exe -y --default-host=${{ matrix.host != '' && matrix.host || 'x86_64-pc-windows-msvc' }} --profile=minimal
           del rustup-init.exe
         shell: powershell
       - name: Ensure stable toolchain is up to date
-        run: rustup update stable
+        run: |
+          rustup update stable
+          rustup default stable
         shell: bash
       - name: Install the target
         run: |
@@ -321,9 +327,11 @@ jobs:
           - target: x86_64-pc-windows-msvc
             run_tests: YES
           - target: x86_64-pc-windows-gnu
+            host: x86_64-pc-windows-gnu
             mingwdir: mingw64
             lto: off
           - target: i686-pc-windows-gnu # skip-pr skip-master
+            host: x86_64-pc-windows-gnu # skip-pr skip-master
             mingwdir: mingw32 # skip-pr skip-master
             lto: off # skip-pr skip-master
     steps:
@@ -386,11 +394,13 @@ jobs:
           # Disable the download progress bar which can cause perf issues
           $ProgressPreference = "SilentlyContinue"
           Invoke-WebRequest https://win.rustup.rs/ -OutFile rustup-init.exe
-          .\rustup-init.exe -y --default-host=x86_64-pc-windows-msvc --profile=minimal
+          .\rustup-init.exe -y --default-host=${{ matrix.host != '' && matrix.host || 'x86_64-pc-windows-msvc' }} --profile=minimal
           del rustup-init.exe
         shell: powershell
       - name: Ensure stable toolchain is up to date
-        run: rustup update stable
+        run: |
+          rustup update stable
+          rustup default stable
         shell: bash
       - name: Install the target
         run: |

diff --git a/ci/actions-templates/windows-builds-template.yaml b/ci/actions-templates/windows-builds-template.yaml
@@ -27,9 +27,11 @@ jobs: # skip-master skip-pr skip-stable
           - target: x86_64-pc-windows-msvc
             run_tests: YES
           - target: x86_64-pc-windows-gnu
+            host: x86_64-pc-windows-gnu
             mingwdir: mingw64
             lto: off
           - target: i686-pc-windows-gnu # skip-pr skip-master
+            host: x86_64-pc-windows-gnu # skip-pr skip-master
             mingwdir: mingw32 # skip-pr skip-master
             lto: off # skip-pr skip-master
     steps:
@@ -92,11 +94,13 @@ jobs: # skip-master skip-pr skip-stable
           # Disable the download progress bar which can cause perf issues
           $ProgressPreference = "SilentlyContinue"
           Invoke-WebRequest https://win.rustup.rs/ -OutFile rustup-init.exe
-          .\rustup-init.exe -y --default-host=x86_64-pc-windows-msvc --profile=minimal
+          .\rustup-init.exe -y --default-host=${{ matrix.host != '' && matrix.host || 'x86_64-pc-windows-msvc' }} --profile=minimal
           del rustup-init.exe
         shell: powershell
       - name: Ensure stable toolchain is up to date
-        run: rustup update stable
+        run: |
+          rustup update stable
+          rustup default stable
         shell: bash
       - name: Install the target
         run: |