diff options
| author | bors <bors@rust-lang.org> | 2025-02-20 05:59:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-20 05:59:04 +0000 |
| commit | eeb9035117dc85fa4abe8e2abb09285fd65b0263 (patch) | |
| tree | 764837db4595c0064f928a3cbb212a27681cb602 | |
| parent | 6d3c050de81c8858e28b0e59cc9398d840edfbff (diff) | |
| parent | 0d0a2a3bea3ad69b4acaa421932cc0d2aee53a58 (diff) | |
| download | rust-eeb9035117dc85fa4abe8e2abb09285fd65b0263.tar.gz rust-eeb9035117dc85fa4abe8e2abb09285fd65b0263.zip | |
Auto merge of #137023 - Kobzol:bump-sccache, r=marcoieni
Bump sccache in CI to 0.9.1 We haven't updated the used sccache version for years, it has accrued a bunch of fixes and features in the meantime. It now supports the `--show-adv-stats` flag, which gives a more detailed summary of the results of caching. And it can also cache Rust code, which could be useful in the future (https://github.com/rust-lang/rust/pull/136942 - although now there are no large wins). It also supports caching PGO now, but since the PGO profiles are always different, it won't make any real difference. https://github.com/rust-lang/rust/pull/133076 previously tried to update the version to 0.3 (CC `@klensy)` r? `@marcoieni`
| -rw-r--r-- | .github/workflows/ci.yml | 1 | ||||
| -rwxr-xr-x | src/ci/docker/run.sh | 10 | ||||
| -rw-r--r-- | src/ci/docker/scripts/sccache.sh | 4 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6f3fcada08..de144ee6104 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,6 +70,7 @@ jobs: HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }} DOCKER_TOKEN: ${{ secrets.GITHUB_TOKEN }} SCCACHE_BUCKET: rust-lang-ci-sccache2 + SCCACHE_REGION: us-west-1 CACHE_DOMAIN: ci-caches.rust-lang.org continue-on-error: ${{ matrix.continue_on_error || false }} strategy: diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index d2697ac27ab..6658b83efc8 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -236,9 +236,15 @@ args= if [ "$SCCACHE_BUCKET" != "" ]; then args="$args --env SCCACHE_BUCKET" args="$args --env SCCACHE_REGION" - args="$args --env AWS_ACCESS_KEY_ID" - args="$args --env AWS_SECRET_ACCESS_KEY" args="$args --env AWS_REGION" + + # Disable S3 authentication for PR builds, because the access keys are missing + if [ "$PR_CI_JOB" != "" ]; then + args="$args --env SCCACHE_S3_NO_CREDENTIALS=1" + else + args="$args --env AWS_ACCESS_KEY_ID" + args="$args --env AWS_SECRET_ACCESS_KEY" + fi else mkdir -p $HOME/.cache/sccache args="$args --env SCCACHE_DIR=/sccache --volume $HOME/.cache/sccache:/sccache" diff --git a/src/ci/docker/scripts/sccache.sh b/src/ci/docker/scripts/sccache.sh index 6c713e1f861..f66671c64d2 100644 --- a/src/ci/docker/scripts/sccache.sh +++ b/src/ci/docker/scripts/sccache.sh @@ -6,10 +6,10 @@ set -ex case "$(uname -m)" in x86_64) - url="https://ci-mirrors.rust-lang.org/rustc/2021-08-24-sccache-v0.2.15-x86_64-unknown-linux-musl" + url="https://ci-mirrors.rust-lang.org/rustc/2025-01-07-sccache-v0.9.1-x86_64-unknown-linux-musl" ;; aarch64) - url="https://ci-mirrors.rust-lang.org/rustc/2021-08-25-sccache-v0.2.15-aarch64-unknown-linux-musl" + url="https://ci-mirrors.rust-lang.org/rustc/2025-01-07-sccache-v0.9.1-aarch64-unknown-linux-musl" ;; *) echo "unsupported architecture: $(uname -m)" diff --git a/src/ci/run.sh b/src/ci/run.sh index b874f71832d..536754f12bc 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -279,5 +279,5 @@ if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then fi echo "::group::sccache stats" -sccache --show-stats || true +sccache --show-adv-stats || true echo "::endgroup::" |