From e4e1c59547d4ffb8ffb683416085dde74fde2e2e Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 1 May 2024 09:06:11 -0700 Subject: [PATCH] Combine CARGO_HOME choice into a single step --- action.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/action.yml b/action.yml index c63c8f0..b2b70d1 100644 --- a/action.yml +++ b/action.yml @@ -68,12 +68,7 @@ runs: if: runner.os != 'Windows' shell: bash - - run: echo CARGO_HOME=${CARGO_HOME:-$HOME/.cargo} >> $GITHUB_ENV - if: runner.os != 'Windows' - shell: bash - - - run: echo CARGO_HOME=${CARGO_HOME:-$USERPROFILE/.cargo} >> $GITHUB_ENV - if: runner.os == 'Windows' + - run: echo CARGO_HOME=${CARGO_HOME:-${{runner.os == 'Windows' && '$USERPROFILE' || '$HOME'}}/.cargo} >> $GITHUB_ENV shell: bash - name: rustup toolchain install ${{steps.parse.outputs.toolchain}}