Skip to content

Commit 1456554

Browse files
authored
Merge branch 'main' into merge-back/2.167.2
2 parents 3669dce + b8f47c8 commit 1456554

File tree

237 files changed

+157227
-7669
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+157227
-7669
lines changed

.github/workflows/codecov.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
uses: actions/setup-node@v4
2020

2121
- name: Install dependencies
22-
run: cd packages/aws-cdk && yarn install
22+
run: yarn install
2323

2424
- name: Build CLI
25-
run: cd packages/aws-cdk && npx lerna run build --scope=aws-cdk
25+
run: npx lerna run build --scope=aws-cdk
2626

2727
- name: Run tests
2828
run: cd packages/aws-cdk && yarn test

.github/workflows/request-cli-integ-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020
- name: Find changed cli files
2121
id: changed-cli-files
22-
uses: tj-actions/changed-files@c3a1bb2c992d77180ae65be6ae6c166cf40f857c
22+
uses: tj-actions/changed-files@4edd678ac3f81e2dc578756871e4d00c19191daf
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |

.mergify.yml

-24
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ queue_rules:
1515
- "#changes-requested-reviews-by=0"
1616
- status-success~=AWS CodeBuild us-east-1
1717
- status-success=validate-pr
18-
- status-success=codecov/patch
19-
- status-success=codecov/patch/packages/aws-cdk
20-
- status-success=codecov/project
21-
- status-success=codecov/project/packages/aws-cdk
2218
commit_message_template: |-
2319
{{ title }} (#{{ number }})
2420
{{ body }}
@@ -37,10 +33,6 @@ queue_rules:
3733
- "#changes-requested-reviews-by=0"
3834
- status-success~=AWS CodeBuild us-east-1
3935
- status-success=validate-pr
40-
- status-success=codecov/patch
41-
- status-success=codecov/patch/packages/aws-cdk
42-
- status-success=codecov/project
43-
- status-success=codecov/project/packages/aws-cdk
4436
commit_message_template: |-
4537
{{ title }} (#{{ number }})
4638
{{ body }}
@@ -72,10 +64,6 @@ pull_request_rules:
7264
- "#changes-requested-reviews-by=0"
7365
- status-success~=AWS CodeBuild us-east-1
7466
- status-success=validate-pr
75-
- status-success=codecov/patch
76-
- status-success=codecov/patch/packages/aws-cdk
77-
- status-success=codecov/project
78-
- status-success=codecov/project/packages/aws-cdk
7967
- name: automatic merge (2+ approvers)
8068
actions:
8169
comment:
@@ -96,10 +84,6 @@ pull_request_rules:
9684
- "#changes-requested-reviews-by=0"
9785
- status-success~=AWS CodeBuild us-east-1
9886
- status-success=validate-pr
99-
- status-success=codecov/patch
100-
- status-success=codecov/patch/packages/aws-cdk
101-
- status-success=codecov/project
102-
- status-success=codecov/project/packages/aws-cdk
10387
- name: automatic merge (no-squash)
10488
actions:
10589
comment:
@@ -120,10 +104,6 @@ pull_request_rules:
120104
- "#changes-requested-reviews-by=0"
121105
- status-success~=AWS CodeBuild us-east-1
122106
- status-success=validate-pr
123-
- status-success=codecov/patch
124-
- status-success=codecov/patch/packages/aws-cdk
125-
- status-success=codecov/project
126-
- status-success=codecov/project/packages/aws-cdk
127107
- name: remove stale reviews
128108
actions:
129109
dismiss_reviews:
@@ -163,7 +143,3 @@ pull_request_rules:
163143
- "#changes-requested-reviews-by=0"
164144
- status-success~=AWS CodeBuild us-east-1
165145
- status-success=validate-pr
166-
- status-success=codecov/patch
167-
- status-success=codecov/patch/packages/aws-cdk
168-
- status-success=codecov/project
169-
- status-success=codecov/project/packages/aws-cdk

CONTRIBUTING.md

+5
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,11 @@ console.log('This cannot be covered')
804804
* Once approved and tested, one of our bots will squash-merge to main and will use your PR title/description as the
805805
commit message.
806806

807+
> [!NOTE]
808+
> If your PR is failing one of the required checks (e.g Codecov), it will not be auto-merged. If you believe the PR should be merged
809+
> inspite of this, let a maintainer know. The maintainer may agree and merge the PR manually, or ask you to address the failing checks.
810+
811+
807812
## Breaking Changes
808813

809814
**_NOTE_**: _Starting with version 2.0.0 of the AWS CDK, **all modules and members vended as part of the main CDK library**_

0 commit comments

Comments
 (0)