Skip to content

ci: auto-resolve lakefile.toml when merging main into the bump branch #931

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

Draft
jessealama wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

ci: auto-resolve lakefile.toml when merging main into the bump branch #931

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03d38f5
ci: auto-resolve lakefile.toml when merging main into the bump branch
jessealama Sep 21, 2026
5b39aa4
ci: run lake update after merging main into the bump branch
jessealama Sep 21, 2026
1879c52
ci: install Lean in the reminder workflow before creating adaptation PRs
jessealama Sep 21, 2026
33d7a9a
ci: drop the lake update step after merging main into the bump branch
jessealama Sep 21, 2026
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
14 changes: 13 additions & 1 deletion scripts/create-adaptation-pr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,22 @@ if git diff --name-only --diff-filter=U | grep -q .; then
git checkout bump/"$BUMPVERSION" -- lean-toolchain lake-manifest.json
git add lean-toolchain lake-manifest.json

# The Mathlib pins on `main` and the bump branch may conflict. Resolve `lakefile.toml`
# hunk-by-hunk, preferring the bump branch but keeping non-conflicting changes from `main`.
if git diff --name-only --diff-filter=U | grep -qx lakefile.toml; then
echo "### Resolving conflicts in 'lakefile.toml' in favor of 'bump/$BUMPVERSION'"
git show :1:lakefile.toml > lakefile.toml.base
git show :3:lakefile.toml > lakefile.toml.main
git checkout --ours -- lakefile.toml
git merge-file --ours lakefile.toml lakefile.toml.base lakefile.toml.main
rm lakefile.toml.base lakefile.toml.main
git add lakefile.toml
fi

# Check if there are more merge conflicts after auto-resolution
if ! git diff --name-only --diff-filter=U | grep -q .; then
# Auto-commit the resolved conflicts if no other conflicts remain
git commit -m "Auto-resolved conflicts in lean-toolchain and lake-manifest.json"
git commit -m "Auto-resolved conflicts in lean-toolchain, lake-manifest.json, and lakefile.toml"
fi
fi

Expand Down
Loading