Skip to content

chore(CI): combine nightly bump and pr-testing merge workflows#1655

Merged
fgdorais merged 3 commits intomainfrom
combine-bump-and-merge-workflows
Mar 4, 2026
Merged

chore(CI): combine nightly bump and pr-testing merge workflows#1655
fgdorais merged 3 commits intomainfrom
combine-bump-and-merge-workflows

Conversation

@kim-em
Copy link
Copy Markdown
Collaborator

@kim-em kim-em commented Feb 4, 2026

This combines nightly_bump_toolchain.yml and discover-lean-pr-testing.yml
into a single nightly_bump_and_merge.yml workflow.

Previously, when the toolchain was bumped:

  1. The bump workflow pushed → CI ran (potentially failing)
  2. This triggered the discover workflow which merged adaptations → CI ran again

This caused spurious CI failure notifications for the intermediate state
(bumped toolchain without the adaptations).

Now both operations happen in a single workflow:

  1. Bump the toolchain (commit locally, don't push yet)
  2. Find and merge any relevant lean-pr-testing branches
  3. Push everything at once → single CI run

The merge script is also updated to not push (the workflow handles the push).

Related

🤖 Prepared with Claude Code

This combines `nightly_bump_toolchain.yml` and `discover-lean-pr-testing.yml`
into a single `nightly_bump_and_merge.yml` workflow.

Previously, when the toolchain was bumped:
1. The bump workflow pushed → CI ran (potentially failing)
2. This triggered the discover workflow which merged adaptations → CI ran again

This caused spurious CI failure notifications for the intermediate state
(bumped toolchain without the adaptations).

Now both operations happen in a single workflow:
1. Bump the toolchain (commit locally)
2. Find and merge any relevant lean-pr-testing branches
3. Push everything at once → single CI run

The merge script is also updated to not push (the workflow handles the push).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
@github-actions github-actions bot added the awaiting-review This PR is ready for review; the author thinks it is ready to be merged. label Feb 4, 2026
mathlib-bors bot pushed a commit to leanprover-community/mathlib4 that referenced this pull request Feb 10, 2026
This combines `nightly_bump_toolchain.yml` and `discover-lean-pr-testing.yml`
into a single `nightly_bump_and_merge.yml` workflow.

Previously, when the toolchain was bumped:
1. The bump workflow pushed → CI ran (potentially failing)
2. This triggered the discover workflow which merged adaptations → CI ran again

This caused spurious CI failure notifications for the intermediate state
(bumped toolchain without the adaptations).

Now both operations happen in a single workflow:
1. Bump the toolchain (commit locally, don't push yet)
2. Find and merge any relevant lean-pr-testing branches
3. Push everything at once → single CI run

The merge script is also updated to not push (the workflow handles the push).

## Related

- Companion PR for batteries: leanprover-community/batteries#1655
- #34821 will need to update the workflow list for `mathlib-nightly-testing` app once this is merged

🤖 Prepared with Claude Code
# Report successful merges
if [ -n "$SUCCESSFUL_MERGES" ]; then
MESSAGE+=$'### Successfully merged branches into Batteries' \'nightly-testing\':\n\n'
MESSAGE+=$'### Successfully merged branches into Batteries'\'' \'nightly-testing\':\n\n'
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Shouldn't this be:

Suggested change
MESSAGE+=$'### Successfully merged branches into Batteries'\'' \'nightly-testing\':\n\n'
MESSAGE+=$'### Successfully merged branches into Batteries\' \'nightly-testing\':\n\n'

Some more examples below.

Comment on lines +65 to +66
echo "RELEASE_TAG=$RELEASE_TAG" >> "${GITHUB_ENV}"
echo "new=$RELEASE_TAG" >> "$GITHUB_OUTPUT"
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Inconsistent use: ${GITHUB_ENV} vs $GITHUB_OUTPUT. There a some other cases. Both work and are commonly used, so this doesn't matter much.

michaellee94 pushed a commit to michaellee94/mathlib4 that referenced this pull request Feb 15, 2026
…rover-community#34827)

This combines `nightly_bump_toolchain.yml` and `discover-lean-pr-testing.yml`
into a single `nightly_bump_and_merge.yml` workflow.

Previously, when the toolchain was bumped:
1. The bump workflow pushed → CI ran (potentially failing)
2. This triggered the discover workflow which merged adaptations → CI ran again

This caused spurious CI failure notifications for the intermediate state
(bumped toolchain without the adaptations).

Now both operations happen in a single workflow:
1. Bump the toolchain (commit locally, don't push yet)
2. Find and merge any relevant lean-pr-testing branches
3. Push everything at once → single CI run

The merge script is also updated to not push (the workflow handles the push).

## Related

- Companion PR for batteries: leanprover-community/batteries#1655
- leanprover-community#34821 will need to update the workflow list for `mathlib-nightly-testing` app once this is merged

🤖 Prepared with Claude Code
rao107 pushed a commit to rao107/mathlib4 that referenced this pull request Feb 18, 2026
…rover-community#34827)

This combines `nightly_bump_toolchain.yml` and `discover-lean-pr-testing.yml`
into a single `nightly_bump_and_merge.yml` workflow.

Previously, when the toolchain was bumped:
1. The bump workflow pushed → CI ran (potentially failing)
2. This triggered the discover workflow which merged adaptations → CI ran again

This caused spurious CI failure notifications for the intermediate state
(bumped toolchain without the adaptations).

Now both operations happen in a single workflow:
1. Bump the toolchain (commit locally, don't push yet)
2. Find and merge any relevant lean-pr-testing branches
3. Push everything at once → single CI run

The merge script is also updated to not push (the workflow handles the push).

## Related

- Companion PR for batteries: leanprover-community/batteries#1655
- leanprover-community#34821 will need to update the workflow list for `mathlib-nightly-testing` app once this is merged

🤖 Prepared with Claude Code
@mathlib-merge-conflicts mathlib-merge-conflicts bot added the merge-conflict This PR has merge conflicts with the `main` branch which must be resolved by the author. label Feb 18, 2026
Maldooor pushed a commit to Maldooor/mathlib4 that referenced this pull request Feb 25, 2026
…rover-community#34827)

This combines `nightly_bump_toolchain.yml` and `discover-lean-pr-testing.yml`
into a single `nightly_bump_and_merge.yml` workflow.

Previously, when the toolchain was bumped:
1. The bump workflow pushed → CI ran (potentially failing)
2. This triggered the discover workflow which merged adaptations → CI ran again

This caused spurious CI failure notifications for the intermediate state
(bumped toolchain without the adaptations).

Now both operations happen in a single workflow:
1. Bump the toolchain (commit locally, don't push yet)
2. Find and merge any relevant lean-pr-testing branches
3. Push everything at once → single CI run

The merge script is also updated to not push (the workflow handles the push).

## Related

- Companion PR for batteries: leanprover-community/batteries#1655
- leanprover-community#34821 will need to update the workflow list for `mathlib-nightly-testing` app once this is merged

🤖 Prepared with Claude Code
pfaffelh pushed a commit to pfaffelh/mathlib4 that referenced this pull request Mar 2, 2026
…rover-community#34827)

This combines `nightly_bump_toolchain.yml` and `discover-lean-pr-testing.yml`
into a single `nightly_bump_and_merge.yml` workflow.

Previously, when the toolchain was bumped:
1. The bump workflow pushed → CI ran (potentially failing)
2. This triggered the discover workflow which merged adaptations → CI ran again

This caused spurious CI failure notifications for the intermediate state
(bumped toolchain without the adaptations).

Now both operations happen in a single workflow:
1. Bump the toolchain (commit locally, don't push yet)
2. Find and merge any relevant lean-pr-testing branches
3. Push everything at once → single CI run

The merge script is also updated to not push (the workflow handles the push).

## Related

- Companion PR for batteries: leanprover-community/batteries#1655
- leanprover-community#34821 will need to update the workflow list for `mathlib-nightly-testing` app once this is merged

🤖 Prepared with Claude Code
kim-em and others added 2 commits March 3, 2026 11:35
…e-workflows

# Conflicts:
#	.github/workflows/nightly_bump_toolchain.yml
Fix $'...' quoting so \n and \' are properly interpreted as escape
sequences, and use consistent $GITHUB_ENV style without braces.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
mathlib-nightly-testing bot added a commit to leanprover-community/mathlib4-nightly-testing that referenced this pull request Mar 3, 2026
@mathlib-merge-conflicts mathlib-merge-conflicts bot removed the merge-conflict This PR has merge conflicts with the `main` branch which must be resolved by the author. label Mar 3, 2026
@kim-em kim-em requested a review from fgdorais March 3, 2026 23:59
@fgdorais fgdorais added this pull request to the merge queue Mar 4, 2026
Merged via the queue into main with commit 8b4f32c Mar 4, 2026
2 checks passed
@github-actions github-actions bot removed the awaiting-review This PR is ready for review; the author thinks it is ready to be merged. label Mar 4, 2026
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.

2 participants