Skip to content

Conversation

@tac0turtle
Copy link
Contributor

Description

to backport a pr add the label backport-to-v0.41.x
for every release branch, we will need to replace or add an entry.

closes: #XXXX


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against correct branch (see CONTRIBUTING.md)
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the module structure standards.
  • Wrote unit and integration tests
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added relevant godoc comments.
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer
  • Review Codecov Report in the comment section below once CI passes

@tac0turtle tac0turtle added the A:automerge Automatically merge PR once all prerequisites pass. label Feb 17, 2021
@tac0turtle tac0turtle self-assigned this Feb 17, 2021
.mergify.yml Outdated
- name: backport patches to v0.41.x branch
conditions:
- base=master
- label=backport-to-v0.41.x
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- label=backport-to-v0.41.x
- label=backport/0.41.x (Stargate)

i guess we could just use the existing one, it's used exactly for this purpose (PRs on master that need to be backported)

Copy link
Contributor

Choose a reason for hiding this comment

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

Can we adopt a different terminology, please? I'm proposing to replace backport with cherry-pick. It's technically more correct (and it's mergify's default terminology too)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh okay, I see people marking the actual backport PR with that label so didnt think it was for that. Good to know we can use it on the original PR.

Can we adopt a different terminology, please? I'm proposing to replace backport with cherry-pick. It's technically more correct (and it's mergify's default terminology too)

The mergify term is backport. (https://mergify.io/features/backports) Dont have a preference. Feel free to push to this pr with what has consensus

Copy link
Contributor

Choose a reason for hiding this comment

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

Meh, ok -.- Let's stick to it

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
@alessio alessio merged commit 0bcc402 into master Feb 17, 2021
@alessio alessio deleted the backports branch February 17, 2021 15:15
@amaury1093
Copy link
Contributor

btw thanks @marbar3778 for having a look at this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A:automerge Automatically merge PR once all prerequisites pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants