From 680d32c37ca30deaa2b922bcbde0c2b6a2914649 Mon Sep 17 00:00:00 2001 From: Lucas Steuernagel Date: Fri, 11 Jul 2025 18:05:18 -0300 Subject: [PATCH] [SOL] Revamp CI --- src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile | 2 +- src/ci/docker/host-x86_64/sbpf-solana-solana/Dockerfile | 2 +- .../docker/host-x86_64/sbpfv1-solana-solana/Dockerfile | 2 +- .../docker/host-x86_64/sbpfv2-solana-solana/Dockerfile | 2 +- .../docker/host-x86_64/sbpfv3-solana-solana/Dockerfile | 2 +- src/ci/github-actions/jobs.yml | 9 +++------ 6 files changed, 8 insertions(+), 11 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 0b6a417c94736..6ae93c21c19f6 100644 --- a/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile +++ b/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile @@ -23,7 +23,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/anza-xyz/cargo-run-solana-tests.git \ - --rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \ + --rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \ --bin cargo-run-solana-tests --root /usr/local COPY scripts/sccache.sh /scripts/ diff --git a/src/ci/docker/host-x86_64/sbpf-solana-solana/Dockerfile b/src/ci/docker/host-x86_64/sbpf-solana-solana/Dockerfile index 93859b9a14648..11e29303ab0c4 100644 --- a/src/ci/docker/host-x86_64/sbpf-solana-solana/Dockerfile +++ b/src/ci/docker/host-x86_64/sbpf-solana-solana/Dockerfile @@ -23,7 +23,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/anza-xyz/cargo-run-solana-tests.git \ - --rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \ + --rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \ --bin cargo-run-solana-tests --root /usr/local COPY scripts/sccache.sh /scripts/ diff --git a/src/ci/docker/host-x86_64/sbpfv1-solana-solana/Dockerfile b/src/ci/docker/host-x86_64/sbpfv1-solana-solana/Dockerfile index 2a07cc8966327..14fab0bf1e9b7 100644 --- a/src/ci/docker/host-x86_64/sbpfv1-solana-solana/Dockerfile +++ b/src/ci/docker/host-x86_64/sbpfv1-solana-solana/Dockerfile @@ -23,7 +23,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/anza-xyz/cargo-run-solana-tests.git \ - --rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \ + --rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \ --bin cargo-run-solana-tests --root /usr/local COPY scripts/sccache.sh /scripts/ diff --git a/src/ci/docker/host-x86_64/sbpfv2-solana-solana/Dockerfile b/src/ci/docker/host-x86_64/sbpfv2-solana-solana/Dockerfile index 22692e8f42438..fd108b242bcf0 100644 --- a/src/ci/docker/host-x86_64/sbpfv2-solana-solana/Dockerfile +++ b/src/ci/docker/host-x86_64/sbpfv2-solana-solana/Dockerfile @@ -23,7 +23,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/anza-xyz/cargo-run-solana-tests.git \ - --rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \ + --rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \ --bin cargo-run-solana-tests --root /usr/local COPY scripts/sccache.sh /scripts/ diff --git a/src/ci/docker/host-x86_64/sbpfv3-solana-solana/Dockerfile b/src/ci/docker/host-x86_64/sbpfv3-solana-solana/Dockerfile index 6732cb6234bbc..90fc5bd018e9d 100644 --- a/src/ci/docker/host-x86_64/sbpfv3-solana-solana/Dockerfile +++ b/src/ci/docker/host-x86_64/sbpfv3-solana-solana/Dockerfile @@ -23,7 +23,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/anza-xyz/cargo-run-solana-tests.git \ - --rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \ + --rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \ --bin cargo-run-solana-tests --root /usr/local COPY scripts/sccache.sh /scripts/ diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 830afbb932009..9fa62efcd7ff3 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -106,9 +106,6 @@ pr: - image: x86_64-gnu-tools continue_on_error: true <<: *job-linux-4c - - image: sbf-solana-solana - continue_on_error: true - <<: *job-linux-4c - image: sbpf-solana-solana continue_on_error: true <<: *job-linux-4c @@ -118,9 +115,9 @@ pr: - image: sbpfv2-solana-solana continue_on_error: true <<: *job-linux-4c -# - image: sbpfv3-solana-solana -# continue_on_error: true -# <<: *job-linux-4c + - image: sbpfv3-solana-solana + continue_on_error: true + <<: *job-linux-4c # Jobs that run when you perform a try build (@bors try) # These jobs automatically inherit envs.try, to avoid repeating