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

chore: apply mergify rules to v2-main branch #11939

Merged
merged 2 commits into from
Dec 9, 2020
Merged

Conversation

nija-at
Copy link
Contributor

@nija-at nija-at commented Dec 8, 2020

The same set of mergify rules are used for 'master' and 'v2-main'
branches.

With these changes, regular PRs from contributors get auto-merged. This
is currently not the case.

This also removes any special rules for v2 and reduces the number of
rules.


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

The same set of mergify rules are used for 'master' and 'v2-main'
branches.

With these changes, regular PRs from contributors get auto-merged. This
is currently not the case.

This also removes any special rules for v2 and reduces the number of
rules.
@nija-at nija-at requested a review from a team December 8, 2020 13:43
@nija-at nija-at self-assigned this Dec 8, 2020
@gitpod-io
Copy link

gitpod-io bot commented Dec 8, 2020

@nija-at nija-at requested a review from njlynch December 8, 2020 13:43
@nija-at nija-at added the pr/do-not-merge This PR should not be merged at this time. label Dec 8, 2020
@@ -121,22 +118,4 @@ pull_request_rules:
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- status-success~=AWS CodeBuild us-east-1
- status-success=validate-pr
- name: automatic merge of v2 forward merges
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't we want auto-merge of FW merges?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Of course. Once we get this in - https://github.com/aws/cdk-ops/pull/1009 - it should not be different from any other PR.

Auto approval is configured here - https://github.com/aws/aws-cdk/blob/master/.github/workflows/auto-approve-v2-merge-forward.yml

Something else I missed?

@nija-at nija-at requested a review from eladb December 8, 2020 14:13
@nija-at nija-at removed the pr/do-not-merge This PR should not be merged at this time. label Dec 9, 2020
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: 475b58a
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@nija-at nija-at merged commit 6f306ad into master Dec 9, 2020
@nija-at nija-at deleted the nija-at/mergify branch December 9, 2020 14:21
flochaz pushed a commit to flochaz/aws-cdk that referenced this pull request Jan 5, 2021
The same set of mergify rules are used for 'master' and 'v2-main'
branches.

With these changes, regular PRs from contributors get auto-merged. This
is currently not the case.

This also removes any special rules for v2 and reduces the number of
rules.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants