toolchain: 1.62.1

Merge pull request #152 from dtolnay/trailingwhitespace
Clean up trailing whitespace from PR 145
2025-07-07 13:48:20 +00:00 · 2025-04-29 12:23:51 -07:00 · 2025-04-29 12:22:45 -07:00 · 2025-04-29 12:20:14 -07:00 · 2025-04-29 12:20:05 -07:00 · 2025-04-29 12:17:54 -07:00
2 changed files with 17 additions and 10 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -12,15 +12,15 @@ permissions:

 jobs:
  install:
-    name: Rust ${{matrix.rust}} on ${{matrix.os == 'ubuntu' && 'Linux' || matrix.os == 'macos' && 'macOS' || matrix.os == 'windows' && 'Windows' || '???'}}
-    runs-on: ${{matrix.os}}-latest
+    name: Rust ${{matrix.rust}} on ${{matrix.os}}
+    runs-on: ${{matrix.os}}
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu, macos, windows]
+        os: [ubuntu-latest, macos-latest, windows-latest, windows-11-arm, ubuntu-22.04-arm]
        rust: [nightly, beta, stable, 1.62.0, stable 18 months ago, stable minus 8 releases]
        include:
-          - os: ubuntu
+          - os: ubuntu-latest
            rust: 1.0.0
    timeout-minutes: 45
    steps:
--- a/action.yml
+++ b/action.yml
@ -6,9 +6,6 @@ branding:
  color: purple

 inputs:
-  toolchain:
-    description: Rust toolchain specification -- see https://rust-lang.github.io/rustup/concepts/toolchains.html#toolchain-specification
-    required: true
  targets:
    description: Comma-separated list of target triples to install for this toolchain
    required: false
@ -47,7 +44,7 @@ runs:
          echo "toolchain=$toolchain" >> $GITHUB_OUTPUT
        fi
      env:
-        toolchain: ${{inputs.toolchain}}
+        toolchain: 1.62.1
      shell: bash

    - id: flags
@ -63,18 +60,28 @@ runs:

    - run: |
        : set $CARGO_HOME
-        echo CARGO_HOME=${CARGO_HOME:-${{runner.os == 'Windows' && '$USERPROFILE' || '$HOME'}}/.cargo} >> $GITHUB_ENV
+        echo CARGO_HOME=${CARGO_HOME:-"${{runner.os == 'Windows' && '$USERPROFILE\.cargo' || '$HOME/.cargo'}}"} >> $GITHUB_ENV
      shell: bash

    - run: |
        : install rustup if needed
        if ! command -v rustup &>/dev/null; then
-          curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
+          curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail https://sh.rustup.rs | sh -s -- --default-toolchain none -y
          echo "$CARGO_HOME/bin" >> $GITHUB_PATH
        fi
      if: runner.os != 'Windows'
      shell: bash

+    - run: |
+        : install rustup if needed on windows
+        if ! command -v rustup &>/dev/null; then
+          curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail https://win.rustup.rs/${{runner.arch == 'ARM64' && 'aarch64' || 'x86_64'}} --output '${{runner.temp}}\rustup-init.exe'
+          '${{runner.temp}}\rustup-init.exe' --default-toolchain none --no-modify-path -y
+          echo "$CARGO_HOME\bin" >> $GITHUB_PATH
+        fi
+      if: runner.os == 'Windows'
+      shell: bash
+
    - name: rustup toolchain install ${{steps.parse.outputs.toolchain}}
      run: rustup toolchain install ${{steps.parse.outputs.toolchain}}${{steps.flags.outputs.targets}}${{steps.flags.outputs.components}} --profile minimal${{steps.flags.outputs.downgrade}} --no-self-update
      shell: bash
Author	SHA1	Message	Date
David Tolnay	b30be30a8b	toolchain: 1.62.1	2025-04-29 12:23:51 -07:00
David Tolnay	b3b07ba8b4	Merge pull request #152 from dtolnay/trailingwhitespace Clean up trailing whitespace from PR 145	2025-04-29 12:22:45 -07:00
David Tolnay	6ff96e92a9	Clean up trailing whitespace from PR 145	2025-04-29 12:20:14 -07:00
David Tolnay	3038d437c0	Merge pull request #151 from dtolnay/winrustup Use rustup.rs advertised download URLs	2025-04-29 12:20:05 -07:00
David Tolnay	d69c8f6cd5	Use rustup.rs advertised download URLs	2025-04-29 12:17:54 -07:00
David Tolnay	c9b8f05fe9	Merge pull request #149 from dtolnay/wincargohome Respect pre-existing CARGO_HOME on Windows	2025-04-29 12:17:40 -07:00
David Tolnay	eceb16e78c	Respect pre-existing CARGO_HOME on Windows	2025-04-29 12:15:51 -07:00
David Tolnay	449259c7e2	Merge pull request #150 from dtolnay/githubpath Fix GITHUB_PATH	2025-04-29 12:14:37 -07:00
David Tolnay	f36efbae07	Fix GITHUB_PATH	2025-04-29 12:11:57 -07:00
David Tolnay	3d21cbbc39	Merge pull request #148 from dtolnay/backslash Consistently use backslash directories on Windows	2025-04-29 12:05:29 -07:00
David Tolnay	802126c77d	Consistently use backslash directories on Windows	2025-04-29 12:03:48 -07:00
David Tolnay	636f3b2e5c	Merge pull request #147 from dtolnay/rustuptemp Download rustup-init.exe to temp dir instead of current dir	2025-04-29 11:55:17 -07:00
David Tolnay	1f3b09e73e	Download rustup-init.exe to temp dir instead of current dir	2025-04-29 11:53:20 -07:00
David Tolnay	1901dba34d	Merge pull request #146 from dtolnay/flags Align curl and rustup-init flags between windows and non-windows	2025-04-29 11:39:38 -07:00
David Tolnay	1c80aedd72	Align curl and rustup-init flags between windows and non-windows	2025-04-29 11:37:07 -07:00
David Tolnay	9ec87f110c	Merge pull request #145 from joe-p/feat/install_rustup_windows Install rustup on windows (including ARM)	2025-04-29 11:33:51 -07:00
Joe Polny	113d6388db	Add ubuntu and windows arm to CI	2025-04-29 14:06:20 -04:00
Joe Polny	d8b2468e88	Install rustup on windows (including ARM) The x86 logic might be overkill since right now x86 Windows images already have it installed, but figured might as well support it just in case. Closes #143	2025-04-29 13:53:42 -04:00