ci: add SCCACHE_S3_KEY_PREFIX (#30652)

.buildkite/hooks/pre-command

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-eval "$(ejson2env .buildkite/env/secrets.ejson)"
+# eval "$(ejson2env .buildkite/env/secrets.ejson)"
 
 # Ensure the pattern "+++ ..." never occurs when |set -x| is set, as buildkite
 # interprets this as the start of a log group.
@@ -18,4 +18,9 @@ HOST_RUST_VERSION="$rust_stable"
 pattern='^[0-9]+\.[0-9]+\.[0-9]+$'
 if [[ ${HOST_RUST_VERSION} =~ ${pattern} ]]; then
     HOST_RUST_VERSION="${rust_stable%.*}"
-fi
+fi
+
+export SBF_TOOLS_VERSION
+
+SCCACHE_S3_KEY_PREFIX="${rust_stable}_${rust_nightly}_${SBF_TOOLS_VERSION}"
+export SCCACHE_S3_KEY_PREFIX

ci/docker-run.sh

@@ -62,6 +62,7 @@ if [[ -n $CI ]]; then
         --env AWS_SECRET_ACCESS_KEY
         --env SCCACHE_BUCKET
         --env SCCACHE_REGION
+        --env SCCACHE_S3_KEY_PREFIX
       )
     fi
   fi