From f9ea045cbd9917727e98427d597972663d372975 Mon Sep 17 00:00:00 2001 From: samkim-crypto Date: Wed, 8 Jul 2026 11:31:21 +0900 Subject: [PATCH 1/2] fix mistakes in the CI script --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 824b24f..403603a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,8 +7,8 @@ on: branches: [main] env: - SBPF_PROGRAM_PACKAGES: "['program']" - RUST_PACKAGES: "['program', secp256k1-verify]" + SBPF_PROGRAM_PACKAGES: "['program', 'secp256k1-verify']" + RUST_PACKAGES: "['program', 'secp256k1-verify']" jobs: set_env: @@ -41,4 +41,4 @@ jobs: rustfmt-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }} clippy-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }} solana-cli-version: ${{ needs.set_env.outputs.SOLANA_CLI_VERSION }} - generate-clilents: false + generate-clients: false From 411c1ea0480e9334a1e84ea59418e89ebe434f66 Mon Sep 17 00:00:00 2001 From: samkim-crypto Date: Wed, 8 Jul 2026 11:41:20 +0900 Subject: [PATCH 2/2] simplify `Makefile` --- Makefile | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index cffb4ff..7995763 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,6 @@ SBF_ARCH = v2 nightly = +${RUST_TOOLCHAIN_NIGHTLY} make-path = $(if $(filter program secp256k1,$1),program,$1) -make-so = $(if $(filter program secp256k1,$1),solana_secp256k1_program,$1) rust-toolchain-nightly: @echo ${RUST_TOOLCHAIN_NIGHTLY} @@ -47,24 +46,10 @@ build-sbf-%: cargo build-sbf --arch $(SBF_ARCH) --manifest-path $(call make-path,$*)/Cargo.toml -- --locked $(ARGS) test-%: - @if [ -f target/deploy/$(call make-so,$*).so ]; then \ - SBF_OUT_DIR=$(PWD)/target/deploy cargo test \ - --locked \ - --manifest-path $(call make-path,$*)/Cargo.toml \ - $(ARGS); \ - else \ - cargo test \ - --locked \ - --manifest-path $(call make-path,$*)/Cargo.toml \ - $(ARGS); \ - fi - -cu-secp256k1: build-sbf-secp256k1 SBF_OUT_DIR=$(PWD)/target/deploy cargo test \ --locked \ - --manifest-path Cargo.toml \ - --test mollusk \ - -- --nocapture + --manifest-path $(call make-path,$*)/Cargo.toml \ + $(ARGS) -generate-clients: - exit 0 +cu-program: build-sbf-secp256k1 + $(MAKE) test-program ARGS="--test verify -- --nocapture"