From ef7534a5529a4e5fa93acacfeaee6e0798771421 Mon Sep 17 00:00:00 2001
From: Jakub Beránek <berykubik@gmail.com>
Date: Thu, 13 Feb 2025 09:44:09 +0100
Subject: Update sccache version used on CI to 0.9.1

---
 src/ci/docker/scripts/sccache.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ci/docker')

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)"
-- 
cgit 1.4.1-3-g733a5


From 0d0a2a3bea3ad69b4acaa421932cc0d2aee53a58 Mon Sep 17 00:00:00 2001
From: Jakub Beránek <berykubik@gmail.com>
Date: Thu, 13 Feb 2025 10:25:57 +0100
Subject: Do not pass empty AWS keys to sccache in PR builds

---
 src/ci/docker/run.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/ci/docker')

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"
-- 
cgit 1.4.1-3-g733a5