Skip to content

[SOL] Revamp CI #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 14, 2025
Merged

[SOL] Revamp CI #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ jobs:
- target: riscv64gc-unknown-linux-gnu
os: ubuntu-latest
rust: nightly-2024-11-01
- target: sbf-solana-solana
os: ubuntu-latest
rust: nightly-2024-11-01
- target: sbpf-solana-solana
os: ubuntu-latest
rust: nightly-2024-11-01
Expand Down Expand Up @@ -127,7 +124,7 @@ jobs:
run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
shell: bash
- run: rustup target add ${{ matrix.target }}
if: ${{ !startsWith(matrix.target, 'sbf') && !startsWith(matrix.target, 'sbpf') }}
if: ${{ !startsWith(matrix.target, 'sbpf') }}
- run: rustup component add llvm-tools-preview
- uses: Swatinem/rust-cache@v2
with:
Expand Down
25 changes: 0 additions & 25 deletions ci/docker/sbf-solana-solana/Dockerfile
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions ci/docker/sbpf-solana-solana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/

RUN 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

RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
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
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
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
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
RUN cp -R ${HOME}/.rustup /tmp/

ENV CARGO_TARGET_SBPF_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
ENV RUSTUP_TOOLCHAIN="solana"
14 changes: 7 additions & 7 deletions ci/docker/sbpfv1-solana-solana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/

RUN 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

RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
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
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
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
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
RUN cp -R ${HOME}/.rustup /tmp/

ENV CARGO_TARGET_SBPFV1_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
ENV RUSTUP_TOOLCHAIN="solana"
14 changes: 7 additions & 7 deletions ci/docker/sbpfv2-solana-solana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/

RUN 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

RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
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
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
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
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
RUN cp -R ${HOME}/.rustup /tmp/

ENV CARGO_TARGET_SBPFV2_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
ENV RUSTUP_TOOLCHAIN="solana"
14 changes: 7 additions & 7 deletions ci/docker/sbpfv3-solana-solana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/

RUN 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

RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
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
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
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
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
RUN cp -R ${HOME}/.rustup /tmp/

ENV CARGO_TARGET_SBPFV3_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
ENV RUSTUP_TOOLCHAIN="solana"
2 changes: 1 addition & 1 deletion ci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [ "${NO_STD:-}" = "1" ]; then
else
run="cargo test --manifest-path testcrate/Cargo.toml --no-fail-fast --target $target"

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