ci: fix PR branch pull step on stable pushes#45019
Merged
Conversation
On workflow_dispatch event, pr-number also carry the name of the branch instead of the PR number when the branch isn't associated with any PR. Such example can be found on stable branch workflow-dispatch : https://github.com/cilium/cilium/actions/runs/23629031538/job/68824091132 In order to avoid error on the PR research with git CLI, we check when the context-ref equals the pr-number. Knowing it's a case where the branch isn't associated with any PR, we then use the context-ref as a base branch to carry on the workflow. Signed-off-by: Antony Reynaud <antony.reynaud@isovalent.com>
Contributor
Author
|
/test |
smagnani96
approved these changes
Mar 27, 2026
aanm
approved these changes
Mar 27, 2026
Artyop
added a commit
that referenced
this pull request
Mar 27, 2026
Fixing bad changes in #45019 pr-number doesn't have the value of the stable branch but a replacement using hyphens instead of the standard dot. Instead of comparing pr-number and context-ref, verify that pr-number is an actual pr-number, if it isn't, assuming the dispatch isn't coming from a PR but Ariane's dispatch, so use the context-ref instead. Fixes #44914 Signed-off-by: Antony Reynaud <antony.reynaud@isovalent.com>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 27, 2026
Fixing bad changes in #45019 pr-number doesn't have the value of the stable branch but a replacement using hyphens instead of the standard dot. Instead of comparing pr-number and context-ref, verify that pr-number is an actual pr-number, if it isn't, assuming the dispatch isn't coming from a PR but Ariane's dispatch, so use the context-ref instead. Fixes #44914 Signed-off-by: Antony Reynaud <antony.reynaud@isovalent.com>
viktor-kurchenko
pushed a commit
that referenced
this pull request
Mar 30, 2026
[ upstream commit 0b72c00 ] Fixing bad changes in #45019 pr-number doesn't have the value of the stable branch but a replacement using hyphens instead of the standard dot. Instead of comparing pr-number and context-ref, verify that pr-number is an actual pr-number, if it isn't, assuming the dispatch isn't coming from a PR but Ariane's dispatch, so use the context-ref instead. Fixes #44914 Signed-off-by: Antony Reynaud <antony.reynaud@isovalent.com> Signed-off-by: viktor-kurchenko <viktor.kurchenko@isovalent.com>
5 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Apr 1, 2026
[ upstream commit 0b72c00 ] Fixing bad changes in #45019 pr-number doesn't have the value of the stable branch but a replacement using hyphens instead of the standard dot. Instead of comparing pr-number and context-ref, verify that pr-number is an actual pr-number, if it isn't, assuming the dispatch isn't coming from a PR but Ariane's dispatch, so use the context-ref instead. Fixes #44914 Signed-off-by: Antony Reynaud <antony.reynaud@isovalent.com> Signed-off-by: viktor-kurchenko <viktor.kurchenko@isovalent.com>
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
5 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.
On workflow_dispatch event, pr-number also carry the name of the branch instead of the PR number when the branch isn't associated with any PR. Such example can be found on stable branch workflow-dispatch : https://github.com/cilium/cilium/actions/runs/23629031538/job/68824091132
In order to avoid error on the PR research with git CLI, we check when the context-ref equals the pr-number. Knowing it's a case where the branch isn't associated with any PR, we then use the context-ref as a base branch to carry on the workflow.
Fixes: https://github.com/cilium/cilium/actions/runs/23629031538/job/68824124379