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 fcc507b572c27..9f65da2521bf1 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -213,6 +213,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" diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index db3df463b63f9..b6e66af36236f 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -39,6 +39,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