Skip to content

Migrate to Makefile workflows#95

Merged
joncinque merged 2 commits intomainfrom
makefile-migration
Oct 14, 2025
Merged

Migrate to Makefile workflows#95
joncinque merged 2 commits intomainfrom
makefile-migration

Conversation

@grod220
Copy link
Copy Markdown
Member

@grod220 grod220 commented Oct 13, 2025

Blocked by solana-program/actions#16

Mirrors work done in solana-program/token-2022#667 & solana-program/associated-token-account#154 & aligns with the effort to standardize CI workflows across solana-program repos. Migrates from pnpm-based script setup to Makefile.

Details

  • Adds root-level Makefile
  • Refactors actions to use new solana-program/actions repo helpers
  • Remove majority of .mts scripts
  • Update docs
  • Add cliff.toml for changelog generation

Follow up work

This effort was meant to translate the existing flows to the new ones. However, it seems like there are a number of checks missing that should be added next:

  • cargo spellcheck
  • extra clippy checks
  • shellcheck
  • sortcheck
  • semver-check

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Trimmed down from https://github.com/solana-program/token-2022/blob/main/Makefile. Added todo's for remaining CI/CD checks in PR description.

@grod220 grod220 force-pushed the makefile-migration branch 17 times, most recently from 275cdf9 to b0a93d5 Compare October 13, 2025 19:23
@grod220 grod220 force-pushed the makefile-migration branch from b0a93d5 to b025074 Compare October 14, 2025 07:58
Copy link
Copy Markdown
Contributor

@rustopian rustopian left a comment

Choose a reason for hiding this comment

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

I agree spellcheck should be its own PR due to the number of comment updates required, but getting a working audit and clippy settings matching the other repos only involves a few lines.

Up to you, but in any case, here are the relevant changes:

Copy link
Copy Markdown
Contributor

@joncinque joncinque left a comment

Choose a reason for hiding this comment

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

Just nits on the README, the rest looks great to me, with Pete's comments applied

Comment on lines +64 to +71
# TODO program_test is too unreliable to run in ci
# the tests are fine, but the underlying transport panics frequently, even with `--test-threads 1`
# we exclude these tests for now because mollusk tests at least provide decent ci coverage
# in the future if we cannot debug the cause we should move program_test to a different execution engine
test-program: ARGS = --features bpf-entrypoint -- --skip program_test

test-%:
SBF_OUT_DIR=$(PWD)/target/deploy cargo $(nightly) test --manifest-path $(call make-path,$*)/Cargo.toml $(ARGS)
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Note update. The current workflow specifically skips program_test. Copied over the code comment and aligned with previous flow.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We use program-test in almost every other repo, so I'm not sure what the comment means, but we can fix it in follow-up work

@grod220 grod220 requested a review from joncinque October 14, 2025 15:25
@grod220 grod220 requested a review from rustopian October 14, 2025 15:25
Copy link
Copy Markdown
Contributor

@rustopian rustopian left a comment

Choose a reason for hiding this comment

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

Looks great

@grod220
Copy link
Copy Markdown
Member Author

grod220 commented Oct 14, 2025

@joncinque needs your final review, but also manual editing of the required checks on this repo 🙏

Copy link
Copy Markdown
Contributor

@joncinque joncinque left a comment

Choose a reason for hiding this comment

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

Thanks for taking care of this!

@joncinque joncinque merged commit 4c4838a into main Oct 14, 2025
18 checks passed
@joncinque joncinque deleted the makefile-migration branch October 14, 2025 18:42
@grod220 grod220 mentioned this pull request Nov 21, 2025
49 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants