Skip to content

Commit 9516242

Browse files
chore: clean up ci caching (#5774)
Signed-off-by: Joe Isaacs <[email protected]>
1 parent 2e137f2 commit 9516242

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

.github/actions/setup-rust/action.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ runs:
3030
DEFAULT_VERSION=$(grep channel rust-toolchain.toml | awk -F'"' '{print $2}')
3131
TOOLCHAIN="${TOOLCHAIN_OVERRIDE:-$DEFAULT_VERSION}"
3232
echo "toolchain=$TOOLCHAIN" >> $GITHUB_OUTPUT
33-
echo "targets=$TARGETS" >> $GITHUB_OUTPUT
3433
env:
3534
TOOLCHAIN_OVERRIDE: ${{ inputs.toolchain }}
36-
TARGETS: ${{ inputs.targets }}
3735

3836
- name: Install Mold
3937
if: runner.os == 'Linux'
@@ -45,14 +43,14 @@ runs:
4543
if: steps.rustup-cache.outputs.cache-hit != 'true'
4644
with:
4745
toolchain: "${{ steps.toolchain-config.outputs.toolchain }}"
48-
targets: "${{ steps.toolchain-config.outputs.targets }}"
46+
targets: "${{ inputs.targets }}"
4947
components: "${{ inputs.components || 'clippy, rustfmt' }}"
5048

5149
- name: Rust Dependency Cache
5250
uses: Swatinem/rust-cache@v2
5351
with:
5452
save-if: ${{ github.ref_name == 'develop' }}
55-
shared-key: "rust-cache-${{ runner.os }}-${{ runner.arch }}-${{ runner.environment }}-${{ steps.toolchain-config.outputs.toolchain }}-${{ steps.toolchain-config.outputs.targets }}${{ inputs.cache-suffix && format('-{0}', inputs.cache-suffix) || '' }}"
53+
shared-key: "rust-cache-${{ runner.os }}-${{ runner.arch }}-${{ runner.environment }}-${{ steps.rust-toolchain.outputs.cachekey }}-${{ inputs.targets }}${{ inputs.cache-suffix && format('-{0}', inputs.cache-suffix) || '' }}"
5654

5755
- name: Rust Compile Cache
5856
uses: mozilla-actions/[email protected]

0 commit comments

Comments
 (0)