[2.5] ci: Fix empty pathspec error in sync-branches workflow #15111
Merged
Conversation
Hapsa21
force-pushed
the
fix-for-2.5-v2
branch
5 times, most recently
from
8766bfe to
9da1a0c
Compare
acolombier
requested changes
Jul 21, 2025
Member
acolombier
left a comment
acolombier
left a comment
There was a problem hiding this comment.
The Sync Branches uses a workflow_call trigger so instead of triggering a no-op, the release workflow should skip calling Sync Branches. This use to be the initial behaviour but I believe this was changed somehow.
| contents: write | ||
| pull-requests: write | ||
| steps: | ||
| # Using an app is the recommended way to allow recursive operations. |
Member
There was a problem hiding this comment.
Please leave this note. THis is something we should look at addressing soon rather than relying on a hardcoded PAT.
acolombier
approved these changes
Jul 21, 2025
Member
acolombier
left a comment
acolombier
left a comment
There was a problem hiding this comment.
LGTM! Let merge and see if this fixes the issue
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
2 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.
This PR targets the 2.5 branch as requested by @daschuer.
It resolves the "empty string is not a valid pathspec" error in the sync-branches workflow.
The workflow was failing when triggered by a commit on a branch that is not a source key in the ACTIVE_VERSIONS map (e.g., the main branch). This caused the TO_BRANCH variable to be empty, leading to a crash when git checkout was called.
This fix adds a preliminary step to check if the triggering branch is a valid source. If not, the sync and merge steps are gracefully skipped.
Fixes #15098