Merge branch 'master' into release

Author: phlogistonjohn

.github/mergify.yml

@@ -0,0 +1,99 @@
+---
+defaults:
+  actions:
+    queue:
+      name: default
+      method: rebase
+      update_method: rebase
+
+
+# each test should be listed separately, do not use regular expressions:
+# https://docs.mergify.io/conditions.html#validating-all-status-check
+# TODO: Use mergify's recently added 'shared configuration support'
+# to dedup some of the check-x=y repetition in the future.
+queue_rules:
+  - name: default
+    conditions:
+      - check-success=check
+      - check-success=build-server
+      - check-success=build-ad-server
+      - check-success=build-nightly-server
+      - check-success=build-nightly-ad-server
+      - check-success=build-client
+      - check-success=build-toolbox
+      - check-success=test-ad-server-kubernetes
+      - check-success=test-nightly-ad-server-kubernetes
+      - check-success=dpulls
+
+
+pull_request_rules:
+  # Clearing approvals after content changes
+  - name: Remove outdated approvals
+    conditions:
+      - base=master
+    actions:
+      dismiss_reviews:
+        approved: true
+        changes_requested: false
+  # Perform automatic merge on conditions
+  - name: Automatic merge on approval
+    conditions:
+      - check-success=check
+      - check-success=build-server
+      - check-success=build-ad-server
+      - check-success=build-nightly-server
+      - check-success=build-nightly-ad-server
+      - check-success=build-client
+      - check-success=build-toolbox
+      - check-success=test-ad-server-kubernetes
+      - check-success=test-nightly-ad-server-kubernetes
+      - check-success=dpulls
+      - "-draft"
+      # Contributors should set the 'do-not-merge' label if they don't want
+      # the PR to be (auto)merged for some reason.
+      - "label!=do-not-merge"
+      # A reviewer should set a label starting with 'review-in-progress' (and
+      # suffixed by their username) in order to indicate a detailed review has
+      # been started and not completed. This will hold the PR until the
+      # label has been removed.
+      - "-label~=^review-in-progress"
+      - "base=master"
+      # Even if there are 2 or more approvals we won't automerge if there are
+      # any changes requested.
+      - "#changes-requested-reviews-by=0"
+      - or:
+        # Any contributor's PR can be automerged with 2 (or more) reviews.
+        - "#approved-reviews-by>=2"
+        # A maintainer's contribution that has already aged long enough to
+        # earn the "priority-review" label can be merged immediately.
+        # The label can also be applied manually in case of an important
+        # bugfix, etc.
+        - and:
+          - "label=priority-review"
+          - "author=@maintainers"
+          - "#approved-reviews-by>=1"
+    actions:
+      queue: {}
+      dismiss_reviews: {}
+  # Conflict resolution prompt
+  - name: Ask contributor to resolve a conflict
+    conditions:
+      - conflict
+    actions:
+      comment:
+        message: "This pull request now has conflicts with the target branch.
+        Please resolve these conflicts and force push the updated branch."
+  # Label PRs that have been sitting there unchanged, aging like a fine wine
+  #
+  # NOTE: the updated-at "counter" resets every time the PR is changed so
+  # reacting to a reviewer's feedback and fixing a typo (for example) will
+  # reset the counter. Thus we now apply a label once we hit the 15 day window
+  # so that we know that PR had, at some time, sat unchanged for that long.
+  - name: Label aged PRs
+    conditions:
+      - "updated-at<15 days ago"
+      - "-draft"
+    actions:
+      label:
+        add:
+          - "priority-review"