Backport of chore(ci): fix backport assistant branch creation race into release/1.15.x#17253
Merged
hc-github-team-consul-core merged 1 commit intorelease/1.15.xfrom May 8, 2023
Conversation
hc-github-team-consul-core
force-pushed
the
backport/dans/fix-backport-assistant-race/supposedly-infinite-sponge
branch
from
9cba115 to
94ecc06
Compare
hc-github-team-consul-core
force-pushed
the
backport/dans/fix-backport-assistant-race/supposedly-infinite-sponge
branch
from
d14cc4c to
b7df061
Compare
github-actions
bot
added
theme/contributing
github-team-consul-core-pr-approver
approved these changes
May 8, 2023
Collaborator
github-team-consul-core-pr-approver
left a comment
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
hc-github-team-consul-core
deleted the
backport/dans/fix-backport-assistant-race/supposedly-infinite-sponge
branch
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.
Backport
This PR is auto-generated from #17249 to be assessed for backporting due to the inclusion of the label backport/1.15.
The below text is copied from the body of the original PR.
Description
A new patch for
backport-assistantwas released to deal with a race in creating the new branch and pushing the PR. For a single PR, this may appear as an error pushing a reference that doesn't exist. For multiple backports, I suspect that it manifests itself as applying the cherry-picked commits on top of the previously checked-out branch.Overview of commits