Remove the swap to main branch after each single-source batch#2649
Merged
Conversation
Swati-Dash
approved these changes
Jun 2, 2026
Ben-Hodgkiss
approved these changes
Jun 2, 2026
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
3 participants
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.
Data Template
Ticket
Additional information:
Upon testing the changes in #2648, the action failed again. The initial fix after batch 1 committed switched the working directory back to main. This meant batch 2 processed pipeline files from main's older state rather than building on top of batch 1's work. When batch 2 then tried to commit to config-manager-update, git refused because the working tree had conflicting versions of the same pipeline files.
This PR fix keeps the working directory on config-manager-update for the entire batch run, and saves the script to /tmp before the first git checkout so the newer version (with --batch-size) isn't overwritten by the older one on config-manager-update.