From d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 1 May 2024 09:11:35 -0700 Subject: [PATCH] Move CARGO_HOME step in front of rustup install --- action.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/action.yml b/action.yml index 9fb35f3..23c6000 100644 --- a/action.yml +++ b/action.yml @@ -60,17 +60,17 @@ runs: 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 - echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH - fi - if: runner.os != 'Windows' + : set $CARGO_HOME + echo CARGO_HOME=${CARGO_HOME:-${{runner.os == 'Windows' && '$USERPROFILE' || '$HOME'}}/.cargo} >> $GITHUB_ENV shell: bash - run: | - : set $CARGO_HOME - echo CARGO_HOME=${CARGO_HOME:-${{runner.os == 'Windows' && '$USERPROFILE' || '$HOME'}}/.cargo} >> $GITHUB_ENV + : 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 + echo "$CARGO_HOME/bin" >> $GITHUB_PATH + fi + if: runner.os != 'Windows' shell: bash - name: rustup toolchain install ${{steps.parse.outputs.toolchain}}