-
-
Notifications
You must be signed in to change notification settings - Fork 248
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into ordered-cache-realtime-logging
- Loading branch information
Showing
5 changed files
with
109 additions
and
196 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1 @@ | ||
| # https://docs.mergify.io/conditions.html | ||
| # https://docs.mergify.io/actions.html | ||
| pull_request_rules: | ||
| - name: "approve automated PRs that have passed checks" | ||
| conditions: | ||
| - "author~=^(cloudpossebot|renovate\\[bot\\])$" | ||
| - "-closed" | ||
| - "head~=^(auto-update|renovate)/.*" | ||
| - "check-success=test/bats" | ||
| - "check-success=test/readme" | ||
| - "check-success=test/terratest" | ||
| - "check-success=validate-codeowners" | ||
| - or: | ||
| - "base=master" | ||
| - "base=main" | ||
| - "base~=^release/v\\d{1,2}$" | ||
|
|
||
| actions: | ||
| review: | ||
| type: "APPROVE" | ||
| bot_account: "cloudposse-mergebot" | ||
| message: "We've automatically approved this PR because the checks from the automated Pull Request have passed." | ||
|
|
||
| - name: "merge automated PRs when approved and tests pass" | ||
| conditions: | ||
| - "author~=^(cloudpossebot|renovate\\[bot\\])$" | ||
| - "-closed" | ||
| - "head~=^(auto-update|renovate)/.*" | ||
| - "check-success=test/bats" | ||
| - "check-success=test/readme" | ||
| - "check-success=test/terratest" | ||
| - "check-success=validate-codeowners" | ||
| - "#approved-reviews-by>=1" | ||
| - "#changes-requested-reviews-by=0" | ||
| - "#commented-reviews-by=0" | ||
| - or: | ||
| - "base=master" | ||
| - "base=main" | ||
| - "base~=^release/v\\d{1,2}$" | ||
|
|
||
| actions: | ||
| merge: | ||
| method: "squash" | ||
|
|
||
| - name: "delete the head branch after merge" | ||
| conditions: | ||
| - "merged" | ||
| actions: | ||
| delete_head_branch: {} | ||
|
|
||
| - name: "ask to resolve conflict" | ||
| conditions: | ||
| - "conflict" | ||
| - "-closed" | ||
| actions: | ||
| comment: | ||
| message: "This pull request is now in conflict. Could you fix it @{{author}}? 🙏" | ||
|
|
||
| - name: "remove outdated reviews" | ||
| conditions: | ||
| - or: | ||
| - "base=master" | ||
| - "base=main" | ||
| - "base~=^release/v\\d{1,2}$" | ||
| actions: | ||
| dismiss_reviews: | ||
| changes_requested: true | ||
| approved: true | ||
| message: "This Pull Request has been updated, so we're dismissing all reviews." | ||
|
|
||
| - name: "close Pull Requests without files changed" | ||
| conditions: | ||
| - "#files=0" | ||
| actions: | ||
| close: | ||
| message: "This pull request has been automatically closed by Mergify because there are no longer any changes." | ||
| extends: .github |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # Upstream changes from _extends are only recognized when modifications are made to this file in the default branch. | ||
| _extends: .github | ||
| repository: | ||
| name: terraform-aws-cloudfront-s3-cdn | ||
| description: Terraform module to easily provision CloudFront CDN backed by an S3 origin | ||
| homepage: https://cloudposse.com/accelerate | ||
| topics: terraform, terraform-module, cloudfront, aws, cloudfront-logs, s3, cdn, hcl2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.