Merge pull request #152 from dtolnay/trailingwhitespace

Clean up trailing whitespace from PR 145
2025-07-07 21:58:19 +00: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 · 2025-04-29 12:17:40 -07:00
1 changed files with 5 additions and 5 deletions
--- a/action.yml
+++ b/action.yml
@ -63,7 +63,7 @@ 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: |
@ -78,9 +78,9 @@ runs:
    - 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 --remote-name https://static.rust-lang.org/rustup/dist/${{ runner.arch == 'ARM64' && 'aarch64' || 'x86_64' }}-pc-windows-msvc/rustup-init.exe
-          ./rustup-init.exe --default-toolchain none --no-modify-path -y
-          echo "$USERPROFILE/.cargo/bin" >> $GITHUB_PATH
+          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
Author	SHA1	Message	Date
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