ci: auto-resolve lakefile.toml when merging main into the bump branch - #931
Open
jessealama wants to merge 4 commits into
Open
jessealama wants to merge 4 commits into
jessealama wants to merge 4 commits into
Conversation
jessealama
requested review from
arademaker,
chenson2018,
fmontesi,
kim-em and
sorrachai
as code owners
September 21, 2026 12:09
jessealama
force-pushed
the
ci/adaptation-pr-resolve-lakefile
branch
2 times, most recently
from
September 21, 2026 12:18
3c627cd to
46bbf92
Compare
main now pins a Mathlib revision in lakefile.toml, while bump/v4.X.0 branches point at mathlib4-nightly-testing. When main moves its pin, the [[require]] block may conflict and create-adaptation-pr.sh bails out in auto mode, so the bump branch reminder fires every few hours. Resolve conflicting hunks in lakefile.toml in favor of the bump branch with git merge-file --ours, keeping non-conflicting changes from main.
Merging main may change lakefile.toml (e.g. add a dependency) while lake-manifest.json is taken whole from the bump branch, leaving the two out of sync. Run lake update after the merge and commit the manifest if it changed.
create-adaptation-pr.sh now runs lake update after merging main into the bump branch, so the job that runs it needs a Lean toolchain. Use lean-action@v1 like the other non-nightly workflows.
jessealama
force-pushed
the
ci/adaptation-pr-resolve-lakefile
branch
from
September 21, 2026 12:19
46bbf92 to
84b49f7
Compare
The resolved lakefile.toml always matches the bump branch's lake-manifest.json, since the only [[require]] block is the Mathlib pin that both branches edit and the bump branch wins. Running lake update was a no-op that required installing Lean in the reminder workflow.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When
mainmoves its Mathlib pin, the[[require]]block inlakefile.tomlmay conflict with themathlib4-nightly-testingpin on thebump/v4.X.0branch. The first step increate-adaptation-pr.sh(mergemaininto the bump branch) didn't handle such changes, so it bailed out. A solution is to resolve changes inlakefile.tomlhunk-by-hunk in favor of the bump branch.