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.

Sign up for GitHub

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

Jump to bottom

Update Readme + Mergify Rule for Maintained Branches #647

Merged
merged 3 commits into from
Jun 27, 2023
Merged

Update Readme + Mergify Rule for Maintained Branches #647

merged 3 commits into from
Jun 27, 2023

Conversation

boojamya
Copy link
Contributor

This PR:

  • Updates the Maintained Branches Table on the Readme

  • Updates the Mergify rule

    • Will not backport PR's to v3 OR v3-ics anymore
    • Instead of backporting all PR's EXCEPT if they have a dont_backport lable, this changes the rule to only backport PR's that have a BACKPORT label.
    • I think this makes more sense as there will most likely be more PR's pointed at specific branches.
    • It also updates the rule to not only backport PR's merged into main, but now allows for PR's to be targeted to any of our maintained branches to also be backported. EXAMPLE: PR targeted at v5 branch with the backport label will also get "backported" into main.
    • Because of this rule change, dependabot does not need to label with dont_backport anymore

(Branch protection rules already have been updated)

I'm also hoping to use this PR as a test to ensure that backporting works correctly and everything in CI is passing across all branches.

@boojamya boojamya added the BACKPORT backport into all maintained branches label Jun 27, 2023
@boojamya boojamya requested a review from a team as a code owner June 27, 2023 20:45
@boojamya boojamya requested a review from jtieri June 27, 2023 20:45
@boojamya boojamya mentioned this pull request Jun 27, 2023
Closed
5 tasks
agouin
agouin approved these changes Jun 27, 2023
View reviewed changes
Copy link
Member

@agouin agouin left a comment

Choose a reason for hiding this comment

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

🚀

@boojamya boojamya merged commit 2c0c5ec into main Jun 27, 2023
8 checks passed
@boojamya boojamya deleted the dan/reame_mergify branch June 27, 2023 23:30
mergify bot pushed a commit that referenced this pull request Jun 27, 2023
@boojamya @mergify
Update Readme + Mergify Rule for Maintained Branches (#647)
310b5ad 
* readme maintained branches

* update mergify rule

* update dependabot labels

(cherry picked from commit 2c0c5ec)
mergify bot pushed a commit that referenced this pull request Jun 27, 2023
@boojamya @mergify
Update Readme + Mergify Rule for Maintained Branches (#647)
6fdcd17 
* readme maintained branches

* update mergify rule

* update dependabot labels

(cherry picked from commit 2c0c5ec)
mergify bot pushed a commit that referenced this pull request Jun 27, 2023
@boojamya @mergify
Update Readme + Mergify Rule for Maintained Branches (#647)
73f83ce 
* readme maintained branches

* update mergify rule

* update dependabot labels

(cherry picked from commit 2c0c5ec)
@mergify mergify bot mentioned this pull request Jun 27, 2023
Merged
mergify bot pushed a commit that referenced this pull request Jun 27, 2023
@boojamya @mergify
Update Readme + Mergify Rule for Maintained Branches (#647)
b31c3f0 
* readme maintained branches

* update mergify rule

* update dependabot labels

(cherry picked from commit 2c0c5ec)
This was referenced Jun 27, 2023
Merged
Merged
Merged
mergify bot added a commit that referenced this pull request Jun 28, 2023
@mergify @boojamya
Update Readme + Mergify Rule for Maintained Branches (#647) (#650)
63a251c 
* readme maintained branches

* update mergify rule

* update dependabot labels

(cherry picked from commit 2c0c5ec)

Co-authored-by: Dan Kanefsky <56059752+boojamya@users.noreply.github.com>
mergify bot added a commit that referenced this pull request Jun 28, 2023
@mergify @boojamya
Update Readme + Mergify Rule for Maintained Branches (#647) (#651)
214bd7f 
* readme maintained branches

* update mergify rule

* update dependabot labels

(cherry picked from commit 2c0c5ec)

Co-authored-by: Dan Kanefsky <56059752+boojamya@users.noreply.github.com>
mergify bot added a commit that referenced this pull request Jun 28, 2023
@mergify @boojamya
Update Readme + Mergify Rule for Maintained Branches (#647) (#648)
f2e848d 
* readme maintained branches

* update mergify rule

* update dependabot labels

(cherry picked from commit 2c0c5ec)

Co-authored-by: Dan Kanefsky <56059752+boojamya@users.noreply.github.com>
mergify bot added a commit that referenced this pull request Jun 28, 2023
@mergify @boojamya
Update Readme + Mergify Rule for Maintained Branches (#647) (#649)
cc4a9eb 
* readme maintained branches

* update mergify rule

* update dependabot labels

(cherry picked from commit 2c0c5ec)

Co-authored-by: Dan Kanefsky <56059752+boojamya@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@agouin agouin agouin approved these changes

@jtieri jtieri Awaiting requested review from jtieri jtieri is a code owner automatically assigned from strangelove-ventures/interchaintest-maintainers

Assignees
No one assigned
Labels
BACKPORT backport into all maintained branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@boojamya @agouin