Skip to content

CI: Move whole repo to a Makefile #101

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
joncinque merged 3 commits into from
Sep 30, 2025
Merged

CI: Move whole repo to a Makefile #101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7570723
CI: Move whole repo to a Makefile
joncinque Sep 29, 2025
7c02fc4
Review feedback
joncinque Sep 30, 2025
0eb1584
Remove unused toolchain / cli versions
joncinque Sep 30, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/publish-rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
needs: set_env
uses: solana-program/actions/.github/workflows/publish-rust.yml@main
with:
sbpf-program-packages: "program confidential-elgamal-registry"
sbpf-program-packages: "program"
solana-cli-version: ${{ needs.set_env.outputs.SOLANA_CLI_VERSION }}
clippy-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }}
rustfmt-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }}
Expand Down
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
RUST_TOOLCHAIN_NIGHTLY = nightly-2025-02-16
SOLANA_CLI_VERSION = 3.0.0
SOLANA_CLI_VERSION = 2.3.4

nightly = +${RUST_TOOLCHAIN_NIGHTLY}

Expand Down Expand Up @@ -33,6 +33,7 @@ spellcheck:
clippy-%:
cargo $(nightly) clippy --manifest-path $(call make-path,$*)/Cargo.toml \
--all-targets \
--all-features \
-- \
--deny=warnings \
--deny=clippy::default_trait_access \
Expand Down
1 change: 0 additions & 1 deletion program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ edition = "2021"

[features]
no-entrypoint = []
test-sbf = []

[dependencies]
borsh = "1.5.7"
Expand Down
4 changes: 0 additions & 4 deletions program/tests/functional.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// Mark this test as BPF-only due to current `ProgramTest` limitations when
// CPIing into the system program
#![cfg(feature = "test-sbf")]
Comment on lines -1 to -3
Copy link

@buffalojoec buffalojoec Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea what this comment might have been alluding to? Looks really old.

Copy link
Contributor Author

@joncinque joncinque Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh yeah there was an issue in program-test way back when where you couldn't reallocate accounts in CPI from native mode because we didn't serialize the accounts in the way expected by on-chain programs. I couldn't find the PR, but I very clearly remember fixing it


use {
solana_feature_gate_interface::Feature,
solana_program::program_option::COption,
Expand Down
Loading