From 39ae7bb82db32cccbe7924533a3274665079c44a Mon Sep 17 00:00:00 2001 From: Alessandro Decina 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 --- src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile | 2 +- src/ci/docker/run.sh | 1 + src/ci/docker/scripts/sccache.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 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 c20a0a6e82e33..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 4cae9c0 \ + --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 28487bce48280..0f2a84c0c1209 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -219,6 +219,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" args="$args --env AWS_REGION" 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"