Skip to content

Commit 2bcc3db

Browse files
committed
[SOL] Revamp CI (anza-xyz#137)
1 parent 3819100 commit 2bcc3db

File tree

6 files changed

+8
-11
lines changed

6 files changed

+8
-11
lines changed

src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
2323

2424
RUN PATH="${HOME}/.cargo/bin:${PATH}" \
2525
cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
26-
--rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
26+
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
2727
--bin cargo-run-solana-tests --root /usr/local
2828

2929
COPY scripts/sccache.sh /scripts/

src/ci/docker/host-x86_64/sbpf-solana-solana/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
2323

2424
RUN PATH="${HOME}/.cargo/bin:${PATH}" \
2525
cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
26-
--rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
26+
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
2727
--bin cargo-run-solana-tests --root /usr/local
2828

2929
COPY scripts/sccache.sh /scripts/

src/ci/docker/host-x86_64/sbpfv1-solana-solana/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
2323

2424
RUN PATH="${HOME}/.cargo/bin:${PATH}" \
2525
cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
26-
--rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
26+
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
2727
--bin cargo-run-solana-tests --root /usr/local
2828

2929
COPY scripts/sccache.sh /scripts/

src/ci/docker/host-x86_64/sbpfv2-solana-solana/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
2323

2424
RUN PATH="${HOME}/.cargo/bin:${PATH}" \
2525
cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
26-
--rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
26+
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
2727
--bin cargo-run-solana-tests --root /usr/local
2828

2929
COPY scripts/sccache.sh /scripts/

src/ci/docker/host-x86_64/sbpfv3-solana-solana/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
2323

2424
RUN PATH="${HOME}/.cargo/bin:${PATH}" \
2525
cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
26-
--rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
26+
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
2727
--bin cargo-run-solana-tests --root /usr/local
2828

2929
COPY scripts/sccache.sh /scripts/

src/ci/github-actions/jobs.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@ pr:
153153
<<: *job-linux-4c
154154
- name: x86_64-gnu-miri
155155
<<: *job-linux-4c
156-
- image: sbf-solana-solana
157-
continue_on_error: true
158-
<<: *job-linux-4c
159156
- image: sbpf-solana-solana
160157
continue_on_error: true
161158
<<: *job-linux-4c
@@ -165,9 +162,9 @@ pr:
165162
- image: sbpfv2-solana-solana
166163
continue_on_error: true
167164
<<: *job-linux-4c
168-
# - image: sbpfv3-solana-solana
169-
# continue_on_error: true
170-
# <<: *job-linux-4c
165+
- image: sbpfv3-solana-solana
166+
continue_on_error: true
167+
<<: *job-linux-4c
171168

172169
# Jobs that run when you perform a try build (@bors try)
173170
# These jobs automatically inherit envs.try, to avoid repeating

0 commit comments

Comments
 (0)