Skip to content

CI: pin cargo-makepad to Cargo.lock revision #654

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

Jump to bottom
Merged
kevinaboos merged 2 commits into from
Jan 12, 2026
Merged

CI: pin cargo-makepad to Cargo.lock revision #654

kevinaboos merged 2 commits into from
Jan 12, 2026
+55 −19

Conversation

@tyreseluo
Copy link
Contributor

@tyreseluo tyreseluo commented Jan 9, 2026 •
edited by kevinaboos
Loading

PR content

Background / Problem

  • Upstream Makepad changes can break cargo-makepad installs in CI.
  • The CI version should match the exact Makepad revision resolved by Cargo, not just the repo/branch in Cargo.toml.

Solution

  • Parse Cargo.lock to extract the actual Makepad git revision and use it to install cargo-makepad.

Changes

  • Add scripts: resolve-makepad-rev.sh
  • Update CI install steps to use parsed repo+rev: builds.yml
  • Update dependency note: Cargo.toml

Related Issue/PR

Fixes #653

@tyreseluo tyreseluo requested a review from kevinaboos January 9, 2026 02:24
@kevinaboos kevinaboos added the waiting-on-review This issue is waiting to be reviewed label Jan 9, 2026
kevinaboos
kevinaboos requested changes Jan 10, 2026
View reviewed changes
Copy link
Member

@kevinaboos kevinaboos left a comment

Choose a reason for hiding this comment

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

Thanks! Just a few small comments.

@kevinaboos kevinaboos added waiting-on-author This issue is waiting on the original author for a response and removed waiting-on-review This issue is waiting to be reviewed labels Jan 10, 2026
@tyreseluo
CI: extract cargo-makepad setup as a composite action
80159d8 
- move the resolve script into the action and use GITHUB_ACTION_PATH
- reuse setup-cargo-makepad in builds workflow
- remove CI note comments from Cargo.toml
@tyreseluo
Copy link
Contributor Author

tyreseluo commented Jan 11, 2026

Yes, It's too scattered, which really makes subsequent maintenance difficult.

I’ve extracted the previously scattered “Resolve Makepad revision + Install cargo-makepad” steps into a single composite action, moved the script and standardized the path, and updated builds.yml to reuse that action across jobs.

I also cleaned up the CI-related notes in Cargo.toml so maintenance is more centralized and less fragile.

@tyreseluo tyreseluo added waiting-on-review This issue is waiting to be reviewed and removed waiting-on-author This issue is waiting on the original author for a response labels Jan 11, 2026
kevinaboos
kevinaboos approved these changes Jan 12, 2026
View reviewed changes
Copy link
Member

@kevinaboos kevinaboos left a comment

Choose a reason for hiding this comment

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

awesome, that looks really good. Thanks!

@kevinaboos kevinaboos removed the waiting-on-review This issue is waiting to be reviewed label Jan 12, 2026
@kevinaboos kevinaboos merged commit 6eaabaa into project-robius:main Jan 12, 2026
11 checks passed
@tyreseluo tyreseluo deleted the fix/ci-makepad-rev branch January 13, 2026 01:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kevinaboos kevinaboos kevinaboos approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

CI: ensure actions use the same version of Makepad as the top-level Cargo.toml

2 participants

@tyreseluo @kevinaboos