Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of chore(ci): fix backport assistant branch creation race into release/1.13.x #17251

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #17249 to be assessed for backporting due to the inclusion of the label backport/1.13.

The below text is copied from the body of the original PR.


Description

A new patch for backport-assistant was 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

@hc-github-team-consul-core hc-github-team-consul-core enabled auto-merge (squash) May 8, 2023 20:31
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dans/fix-backport-assistant-race/internally-picked-griffon branch from 5a9609e to a7460ad Compare May 8, 2023 20:31
@github-actions github-actions bot added theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases labels May 8, 2023
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@hc-github-team-consul-core hc-github-team-consul-core merged commit 6718324 into release/1.13.x May 8, 2023
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/dans/fix-backport-assistant-race/internally-picked-griffon branch May 8, 2023 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants