diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 025b228f85..4c798a83d3 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -28,5 +28,11 @@ fi export SBF_TOOLS_VERSION -SCCACHE_S3_KEY_PREFIX="${rust_stable}_${rust_nightly}_${SBF_TOOLS_VERSION}" +SCCACHE_KEY_PREFIX="${rust_stable}_${rust_nightly}_${SBF_TOOLS_VERSION}" +export SCCACHE_KEY_PREFIX + +SCCACHE_S3_KEY_PREFIX="$SCCACHE_KEY_PREFIX" export SCCACHE_S3_KEY_PREFIX + +SCCACHE_GCS_KEY_PREFIX="$SCCACHE_KEY_PREFIX" +export SCCACHE_GCS_KEY_PREFIX diff --git a/ci/docker-run.sh b/ci/docker-run.sh index 52d3807394..8e43bcad55 100755 --- a/ci/docker-run.sh +++ b/ci/docker-run.sh @@ -51,16 +51,34 @@ if [[ -n $CI ]]; then # sccache-related bugs echo "--- $0 ... (with sccache being DISABLED due to many (${BUILDKITE_RETRY_COUNT}) retries)" else - echo "--- $0 ... (with sccache enabled with prefix: $SCCACHE_S3_KEY_PREFIX)" + echo "--- $0 ... (with sccache enabled with prefix: $SCCACHE_KEY_PREFIX)" + # sccache ARGS+=( --env "RUSTC_WRAPPER=/usr/local/cargo/bin/sccache" - --env AWS_ACCESS_KEY_ID - --env AWS_SECRET_ACCESS_KEY - --env SCCACHE_BUCKET - --env SCCACHE_REGION - --env SCCACHE_S3_KEY_PREFIX ) + + # s3 + if [ -n "$AWS_ACCESS_KEY_ID" ]; then + ARGS+=( + --env AWS_ACCESS_KEY_ID + --env AWS_SECRET_ACCESS_KEY + --env SCCACHE_BUCKET + --env SCCACHE_REGION + --env SCCACHE_S3_KEY_PREFIX + ) + fi + + # gcs + if [ -n "$SCCACHE_GCS_KEY_PATH" ]; then + ARGS+=( + --env SCCACHE_GCS_KEY_PATH + --volume "$SCCACHE_GCS_KEY_PATH:$SCCACHE_GCS_KEY_PATH" + --env SCCACHE_GCS_BUCKET + --env SCCACHE_GCS_RW_MODE + --env SCCACHE_GCS_KEY_PREFIX + ) + fi fi fi fi