From d75c91b8bdf9417000a8735f5aadb294d5b7d4ef Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Mon, 3 Jan 2022 11:55:48 +1100
Subject: [PATCH] [SOL] CI: speed up PR runs

Deploy new sccache with support for SCCACHE_S3_NO_CREDENTIALS
---
 .github/workflows/ci.yml                               | 1 +
 src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile | 2 +-
 src/ci/docker/run.sh                                   | 1 +
 src/ci/docker/scripts/sccache.sh                       | 2 +-
 src/ci/github-actions/ci.yml                           | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 868f685d35be2..c4d9246ca86bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,6 +36,7 @@ jobs:
       CI_JOB_NAME: "${{ matrix.name }}"
       SCCACHE_BUCKET: cached-ci-artifacts
       SCCACHE_REGION: us-east-2
+      SCCACHE_S3_NO_CREDENTIALS: 1
       TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
       CACHE_DOMAIN: cached-ci-artifacts.s3.us-east-2.amazonaws.com
     if: "github.event_name == 'pull_request'"
diff --git a/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile b/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile
index fcd40a7607935..146c2a08ebfe8 100644
--- a/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile
+++ b/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile
@@ -21,7 +21,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 RUN PATH="${HOME}/.cargo/bin:${PATH}" \
     cargo install --git https://github.com/solana-labs/cargo-run-bpf-tests.git \
-    --rev e03e1da \
+    --rev 3d628c7 \
     --bin cargo-run-bpf-tests --root /usr/local
 
 COPY scripts/sccache.sh /scripts/
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index e42b4748fdc78..8fc2bd05e50fe 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -161,6 +161,7 @@ args=
 if [ "$SCCACHE_BUCKET" != "" ]; then
     args="$args --env SCCACHE_BUCKET"
     args="$args --env SCCACHE_REGION"
+    args="$args --env SCCACHE_S3_NO_CREDENTIALS"
     args="$args --env AWS_ACCESS_KEY_ID"
     args="$args --env AWS_SECRET_ACCESS_KEY"
 else
diff --git a/src/ci/docker/scripts/sccache.sh b/src/ci/docker/scripts/sccache.sh
index 626279efc8e45..4ea5ab6ffa285 100644
--- a/src/ci/docker/scripts/sccache.sh
+++ b/src/ci/docker/scripts/sccache.sh
@@ -6,7 +6,7 @@ set -ex
 
 case "$(uname -m)" in
     x86_64)
-        url="https://cached-ci-artifacts.s3.us-east-2.amazonaws.com/sccache-bc014e0-x86_64-unknown-linux-musl"
+        url="https://cached-ci-artifacts.s3.us-east-2.amazonaws.com/sccache-5d2a373-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"
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index e908f2f53f61c..cff96215a51ad 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -35,6 +35,7 @@ x--expand-yaml-anchors--remove:
   - &public-variables
     SCCACHE_BUCKET: cached-ci-artifacts
     SCCACHE_REGION: us-east-2
+    SCCACHE_S3_NO_CREDENTIALS: 1
     TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
     CACHE_DOMAIN: cached-ci-artifacts.s3.us-east-2.amazonaws.com