Skip to content

Commit f6eaafd

Browse files
authored
Merge branch 'main' into docs-fix-AppSyncAuthorizationType-enum-references
2 parents d6c38ab + 628e649 commit f6eaafd

File tree

31 files changed

+71474
-1315
lines changed

31 files changed

+71474
-1315
lines changed

.mergify.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,27 @@ pull_request_rules:
7676
conditions:
7777
- base!=release
7878
- -title~=(WIP|wip)
79+
- -label~=(blocked|do-not-merge|no-squash|two-approvers|priority-pr)
80+
- -merged
81+
- -closed
82+
- author!=dependabot[bot]
83+
- author!=dependabot-preview[bot]
84+
- "#approved-reviews-by>=1"
85+
- -approved-reviews-by~=author
86+
# This is important! It makes the PR Linter work.
87+
- "#changes-requested-reviews-by=0"
88+
- status-success~=AWS CodeBuild us-east-1
89+
- status-success=validate-pr
90+
- name: automatic priority merge
91+
actions:
92+
comment:
93+
message: Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and 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)).
94+
queue:
95+
name: priority-squash
96+
conditions:
97+
- base!=release
98+
- -title~=(WIP|wip)
99+
- label~=priority-pr
79100
- -label~=(blocked|do-not-merge|no-squash|two-approvers)
80101
- -merged
81102
- -closed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,5 +177,6 @@
177177
},
178178
"dependencies": {
179179
"string-width": "^4.2.3"
180-
}
180+
},
181+
"packageManager": "[email protected]+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
181182
}

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.vpc-endpoint.js.snapshot/ApiGatewayVpcEndpointIntegDefaultTestDeployAssert55D396EF.assets.json

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)