Skip to content

Commit 787b831

Browse files
committed
Add SBPFv1 to the CI pipeline
1 parent 703677b commit 787b831

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

ci/test-stable.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,12 @@ test-stable-sbf)
5555
# Install the platform tools
5656
_ platform-tools-sdk/sbf/scripts/install.sh
5757

58-
# SBF program tests
58+
# SBPFv0 program tests
5959
_ make -C programs/sbf test-v0
6060

61+
# SBPFv1 program tests
62+
_ make -C programs/sbf clean-all test-v1
63+
6164
exit 0
6265
;;
6366
test-docs)

programs/sbf/Makefile

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,27 @@ SBF_SDK_PATH := ../../platform-tools-sdk/sbf
22
SRC_DIR := c/src
33
OUT_DIR := target/deploy
44

5-
test-v0: all rust-v0
5+
clean-all: clean
6+
cargo clean
7+
8+
test:
69
SBF_OUT_DIR=$(OUT_DIR) cargo test --features="sbf_rust,sbf_c" $(TEST_ARGS)
710

11+
test-v1:
12+
SBPF_CPU=v1 $(MAKE) all ; \
13+
$(MAKE) rust-v1 ; \
14+
$(MAKE) test
15+
16+
test-v0: all rust-v0 test
17+
818
rust-v0:
919
cargo +solana build --release --target sbpf-solana-solana --workspace ; \
1020
cp -r target/sbpf-solana-solana/release/* target/deploy
1121

12-
.PHONY: rust
22+
rust-v1:
23+
cargo +solana build --release --target sbpfv1-solana-solana --workspace ; \
24+
cp -r target/sbpfv1-solana-solana/release/* target/deploy
25+
26+
.PHONY: rust-v0
1327

1428
include $(SBF_SDK_PATH)/c/sbf.mk

0 commit comments

Comments
 (0)