Skip to content

Commit 00a466b

Browse files
committed
Improved: additional-rustc-args is now part of the cache key in builds.
1 parent d1cf2cf commit 00a466b

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

action.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@ runs:
125125
SAFE_ADDITIONAL_STD_FEATURES="no-std-features"
126126
fi
127127
128+
# Sanitize additional-rustc-args string to be filesystem safe
129+
SAFE_ADDITIONAL_RUSTC_ARGS=$(echo "${{ inputs.additional-rustc-args }}" | tr -dc '[:alnum:],_-' | tr ',' '-')
130+
if [ -z "$SAFE_ADDITIONAL_RUSTC_ARGS" ]; then
131+
SAFE_ADDITIONAL_RUSTC_ARGS="no-rustc-args"
132+
fi
133+
128134
# Sanitize workspace path - convert '.' to empty string
129135
WORKSPACE_PATH=$(echo "${{ env.WORKSPACE_PATH }}" | sed 's/^\.$//')
130136
@@ -142,12 +148,13 @@ runs:
142148
echo "ARTIFACT_OUT_DIR=${ARTIFACT_OUT_DIR}" >> $GITHUB_ENV
143149
echo "SAFE_FEATURES=${SAFE_FEATURES}" >> $GITHUB_ENV
144150
echo "SAFE_ADDITIONAL_STD_FEATURES=${SAFE_ADDITIONAL_STD_FEATURES}" >> $GITHUB_ENV
151+
echo "SAFE_ADDITIONAL_RUSTC_ARGS=${SAFE_ADDITIONAL_RUSTC_ARGS}" >> $GITHUB_ENV
145152
146153
- name: Setup Rust Caching
147154
if: inputs.use-cache == 'true'
148155
uses: Swatinem/rust-cache@v2
149156
with:
150-
key: build-${{ env.WORKSPACE_PATH }}-${{ inputs.crate-name }}-${{ inputs.target }}-${{ env.SAFE_FEATURES }}-${{ env.SAFE_ADDITIONAL_STD_FEATURES }}-${{ inputs.no-default-features }}-${{ inputs.build-library }}-${{ inputs.crate-types }}-${{ inputs.use-cross }}
157+
key: build-${{ env.WORKSPACE_PATH }}-${{ inputs.crate-name }}-${{ inputs.target }}-${{ env.SAFE_FEATURES }}-${{ env.SAFE_ADDITIONAL_STD_FEATURES }}-${{ env.SAFE_ADDITIONAL_RUSTC_ARGS }}-${{ inputs.no-default-features }}-${{ inputs.build-library }}-${{ inputs.crate-types }}-${{ inputs.use-cross }}
151158
cache-on-failure: true
152159
cache-all-crates: true
153160
workspaces: |

0 commit comments

Comments
 (0)