From 599aab1ca4a4cbda473e405d64f6d9025db0d51b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 21 Jul 2023 10:42:31 -0400 Subject: [PATCH] chore: unfreeze main branch (backport #3560) (#3561) Co-authored-by: Mark McCulloh --- .mergify.yml | 54 +++++++++++++++++++--------------------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 6fbc8fc550c..8ebe3457d0b 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -28,45 +28,31 @@ pull_request_rules: - "#review-threads-unresolved=0" - -approved-reviews-by~=author - check-success=Validate PR title - - or: - - base=main - - base=dev - - or: - # Code freeze at 7am utc July 13th 2023 - - updated-at<=2023-07-13T07:00:00Z - - base=dev + - base=main - or: - check-success=Quality Gate - -files~=^(?!docs/|logo/) - - name: backport change to main - conditions: - - base=dev - - label=pr/backport - actions: - backport: - branches: - - main - - - name: documentation backport - conditions: - - base=dev - - updated-at > 2023-07-13T07:00:00Z - - -files~=^(?!docs/|logo/) - actions: - label: - add: - - pr/backport - - - name: Inform about code freeze + - name: requires manual merge conditions: + - files=.mergify.yml + - -title~=(?i)wip + - -label~=(🚧 pr/do-not-merge|⚠️ pr/review-mutation|⚠️ mergify/review-config) + - -merged + - -closed + - "#approved-reviews-by>=1" + - "#changes-requested-reviews-by=0" + - "#review-threads-unresolved=0" + - -approved-reviews-by~=author + - check-success=Validate PR title + - check-success=Quality Gate - base=main - - updated-at > 2023-07-13T07:00:00Z - - -author=mergify[bot] actions: comment: - message: | - :warning: **Code freeze in effect!** :warning: - - The `main` branch is currently frozen. Only critical fixes or documentation updates will be merged. - Please submit your pull request against the `dev` branch instead. + message: Thank you for contributing! Your pull request contains mergify configuration changes and needs manual merge from a maintainer (be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)). + label: + add: + - ⚠️ mergify/review-config + request_reviews: + teams: + - "@winglang/maintainers"