Skip to content

Commit 70588e8

Browse files
LucasSteLucasSte
authored
[SOL] Revamp CI (#34)
1 parent 759adff commit 70588e8

File tree

7 files changed

+30
-58
lines changed

7 files changed

+30
-58
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ jobs:
6767
- target: riscv64gc-unknown-linux-gnu
6868
os: ubuntu-latest
6969
rust: nightly-2024-11-01
70-
- target: sbf-solana-solana
71-
os: ubuntu-latest
72-
rust: nightly-2024-11-01
7370
- target: sbpf-solana-solana
7471
os: ubuntu-latest
7572
rust: nightly-2024-11-01
@@ -127,7 +124,7 @@ jobs:
127124
run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
128125
shell: bash
129126
- run: rustup target add ${{ matrix.target }}
130-
if: ${{ !startsWith(matrix.target, 'sbf') && !startsWith(matrix.target, 'sbpf') }}
127+
if: ${{ !startsWith(matrix.target, 'sbpf') }}
131128
- run: rustup component add llvm-tools-preview
132129
- uses: Swatinem/rust-cache@v2
133130
with:

‎ci/docker/sbf-solana-solana/Dockerfile‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎ci/docker/sbpf-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
13+
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.47/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPF_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎ci/docker/sbpfv1-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
13+
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.47/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPFV1_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎ci/docker/sbpfv2-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
13+
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.47/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPFV2_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎ci/docker/sbpfv3-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
13+
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.47/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPFV3_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎ci/run.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if [ "${NO_STD:-}" = "1" ]; then
2525
else
2626
run="cargo test --manifest-path testcrate/Cargo.toml --no-fail-fast --target $target"
2727

28-
if [[ ! "$target" =~ ^sbf && ! "$target" =~ ^sbpf- && ! "$target" =~ ^sbpfv3- ]]; then
28+
if [[ ! "$target" =~ ^sbf && ! "$target" =~ ^sbpf- ]]; then
2929
# Not using release mode causes a stack overflow in SBPFv0
3030
# There is a bug in SBPFv3 whereby we were not adding returns to -O0 code
3131
$run

0 commit comments

Comments
 (0)