Skip to content

Fix candidate bundle path in the integration pipeline - #78

Merged
RidhaOracle merged 1 commit into
trunkfrom
fix-merge-bundle-path
Nov 4, 2026
Merged

RidhaOracle merged 1 commit into
trunkfrom
fix-merge-bundle-path

Conversation

@RidhaOracle

Copy link
Copy Markdown
Owner

What does this change do?

Resolves the candidate bundle output path before running Git in its temporary repository. Adds a regression test using the same relative pipeline directory as the Actions workflow.

Why is it needed?

/integrate currently fails during preparation: git bundle create interprets pipeline/candidates.bundle.tmp relative to the temporary bare repository, where the directory does not exist. Existing tests supplied absolute paths and missed this case.

Merge across versions

Target trunk, where the trusted merge automation runs.

How was it tested?

  • The relative-directory reproduction fails before the change and passes afterward.
  • All 58 merger regression tests pass.
  • git diff --check passes.
  • Full MySQL builds and MTR were not run for this Python path correction.

Contributor checklist

  • Commits are focused with descriptive messages

AI assistance

  • I did not use AI assistance for this contribution
  • I used AI assistance for this contribution

Codex reproduced the failure, prepared the correction, and ran the regression tests.

Areas touched

scripts/ce_merge/git.py and scripts/ce_merge/tests/test_pipeline.py.

@github-actions github-actions Bot added Build Passed PR build passed MTR Passed MTR suite passed labels Nov 4, 2026
@RidhaOracle
RidhaOracle merged commit e373b56 into trunk Nov 4, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Build Passed PR build passed MTR Passed MTR suite passed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant