Skip to content

Commit 1bfadd1

Browse files
mazyu36mazyu36
authored
Merge branch 'main' into feature/amplify-build
2 parents 13a6ac6 + ae87e26 commit 1bfadd1

File tree

3,911 files changed

+2981849
-2526993
lines changed

Some content is hidden

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

3,911 files changed

+2981849
-2526993
lines changed

‎.github/workflows/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,3 +139,6 @@ Owner: CDK Support team
139139

140140
[project-prioritization-added-on.yml](project-prioritization-added-on.yml): GitHub action that runs every day to update AddedOn field in the prioritization project board.
141141
Owner: CDK Support team
142+
143+
### Issue sync
144+
[issue-sync.yml](issue-sync.yml): Github action that syncs issue metadat with the project board. More details can be found on the [project-sync](../../tools/@aws-cdk/project-sync) package.

‎.github/workflows/codebuild-pr-build.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: Codebuild PR Build
2+
3+
on:
4+
workflow_dispatch: {}
5+
merge_group: {}
6+
push:
7+
branches:
8+
- main
9+
- v2-release
10+
pull_request: {}
11+
12+
# For every PR, cancel any previous builds in progress
13+
# ... but for all other builds we keep them running
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.pull_request.number || github.run_id }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
build:
20+
runs-on: codebuild-aws-cdk-github-actions-runner-${{ github.run_id }}-${{ github.run_attempt }}
21+
22+
env:
23+
PR_BUILD: true
24+
25+
steps:
26+
- name: Checkout code
27+
uses: actions/checkout@v4
28+
29+
- name: Setup Node.js
30+
uses: actions/setup-node@v4
31+
with:
32+
node-version: "18"
33+
cache: "yarn"
34+
35+
- name: Set up Docker
36+
uses: docker/setup-buildx-action@v3
37+
38+
- name: Load Docker images
39+
id: docker-cache
40+
uses: actions/cache/restore@v4
41+
with:
42+
path: |
43+
~/.docker-images.tar
44+
key: docker-cache-${{ runner.os }}
45+
46+
- name: Restore Docker images
47+
if: ${{ steps.docker-cache.outputs.cache-hit }}
48+
run: docker image load --input ~/.docker-images.tar
49+
50+
- name: Cache build artifacts
51+
uses: actions/cache@v4
52+
with:
53+
path: |
54+
~/.s3buildcache
55+
key: s3buildcache-${{ runner.os }}
56+
57+
- name: Configure system settings
58+
run: |
59+
(command -v sysctl || sudo apt-get update && sudo apt-get install -y procps) && \
60+
sudo sysctl -w vm.max_map_count=2251954
61+
62+
- name: Build
63+
run: /bin/bash ./build.sh --ci
64+
65+
- name: Run Rosetta
66+
run: /bin/bash ./scripts/run-rosetta.sh
67+
68+
- name: Check for uncommitted changes
69+
run: git diff-index --exit-code --ignore-space-at-eol --stat HEAD
70+
71+
- name: Export Docker images
72+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
73+
run: docker image save --output ~/.docker-images.tar $(docker image list --format '{{ if ne .Repository "<none>" }}{{ .Repository }}{{ if ne .Tag "<none>" }}:{{ .Tag }}{{ end }}{{ else }}{{ .ID }}{{ end }}')
74+
75+
- name: Cache Docker images
76+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
77+
uses: actions/cache/save@v4
78+
with:
79+
path: |
80+
~/.docker-images.tar
81+
key: docker-cache-${{ runner.os }}

‎.github/workflows/codecov-upload.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,21 @@ jobs:
2020
github.event.workflow_run.conclusion == 'success'
2121
2222
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v4
2325
- name: Download Artifacts
2426
uses: actions/download-artifact@v4
2527
with:
2628
name: coverage-artifacts
27-
path: ./coverage
29+
path: ./packages/aws-cdk-lib/core/coverage
2830
github-token: ${{ secrets.GITHUB_TOKEN }}
2931
repository: ${{ github.repository }}
3032
run-id: ${{ github.event.workflow_run.id }}
3133

3234
- name: Upload to Codecov
3335
uses: codecov/codecov-action@v5
3436
with:
35-
files: ./coverage/packages/aws-cdk-lib/coverage/cobertura-coverage.xml
37+
files: ./packages/aws-cdk-lib/core/coverage/cobertura-coverage.xml
3638
fail_ci_if_error: true
3739
flags: suite.unit
3840
use_oidc: true

‎.github/workflows/enum-auto-updater.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
# If a PR exists, close it
8787
if [[ -n "$prExists" ]]; then
8888
echo "Found existing PR #$prExists for module ${moduleName#aws-}, closing it..."
89-
gh pr close "$prExists" --confirm
89+
gh pr close "$prExists" -c "Closing in favor of a new PR with updated enum values"
9090
else
9191
echo "No existing PR found for ${moduleName#aws-}"
9292
fi

‎.github/workflows/github-merit-badger.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
1818
thresholds: '[0,3,6,13,25,50]'
1919
badge-type: 'achievement'
20-
ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,Y-JayKim,ykethan,astiwana,maharajhaider,aws-cdk-automation,dependabot[bot],mergify[bot],aemada-aws,ozelalisen,abogical,alinko-aws,vishaalmehrishi,alvazjor,kumsmrit,kumvprat,leonmk-aws,matboros,gasolima]'
20+
ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,Y-JayKim,ykethan,astiwana,maharajhaider,aws-cdk-automation,dependabot[bot],mergify[bot],aemada-aws,ozelalisen,abogical,alinko-aws,vishaalmehrishi,alvazjor,kumsmrit,kumvprat,leonmk-aws,matboros,gasolima,abidhasan-aws]'

‎.github/workflows/issue-label-assign.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,5 +284,10 @@ env:
284284
{"area":"@aws-cdk/integ-runner","keywords":["integ-runner"],"labels":["@aws-cdk/integ-runner"]},
285285
{"area":"@aws-cdk/app-staging-synthesizer-alpha", "keywords":["app-staging-synthesizer", "app-staging-synthesizer-alpha"],"labels":["@aws-cdk/app-staging-synthesizer-alpha"]},
286286
{"area":"@aws-cdk/aws-location-alpha", "keywords":["aws-location", "aws-location-alpha"],"labels":["@aws-cdk/aws-location-alpha"]},
287-
{"area":"@aws-cdk/cli-lib-alpha", "keywords":["cli-lib", "cli-lib-alpha"],"labels":["@aws-cdk/cli-lib-alpha"]}
287+
{"area":"@aws-cdk/cli-lib-alpha", "keywords":["cli-lib", "cli-lib-alpha"],"labels":["@aws-cdk/cli-lib-alpha"]},
288+
{"area":"@aws-cdk/aws-applicationsignals-alpha", "keywords":["aws-applicationsignals", "aws-applicationsignals-alpha"],"labels":["@aws-cdk/aws-applicationsignals-alpha"]},
289+
{"area":"@aws-cdk/aws-s3tables-alpha", "keywords":["aws-s3tables", "aws-s3tables-alpha"],"labels":["@aws-cdk/aws-s3tables-alpha"]},
290+
{"area":"@aws-cdk/aws-pipes-enrichments-alpha", "keywords":["aws-pipes-enrichments", "aws-pipes-enrichments-alpha"],"labels":["@aws-cdk/aws-pipes-enrichments-alpha"]},
291+
{"area":"@aws-cdk/aws-pipes-sources-alpha", "keywords":["aws-pipes-sources", "aws-pipes-sources-alpha"],"labels":["@aws-cdk/aws-pipes-sources-alpha"]},
292+
{"area":"@aws-cdk/aws-pipes-targets-alpha", "keywords":["aws-pipes-targets", "aws-pipes-targets-alpha"],"labels":["@aws-cdk/aws-pipes-targets-alpha"]}
288293
]

‎.github/workflows/issue-sync.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Issue Sync
2+
3+
on: [issues, issue_comment]
4+
5+
jobs:
6+
sync-issue:
7+
name: Sync Issue with Project Board
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v4
12+
13+
- name: Setup Node.js
14+
uses: actions/setup-node@v4
15+
with:
16+
node-version: '20'
17+
cache: 'yarn'
18+
cache-dependency-path: 'yarn.lock'
19+
20+
# Cache node_modules
21+
- name: Cache node_modules
22+
uses: actions/cache@v4
23+
id: cache-modules
24+
with:
25+
path: |
26+
tools/@aws-cdk/project-sync/node_modules
27+
node_modules
28+
key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
29+
restore-keys: |
30+
${{ runner.os }}-modules-
31+
32+
- name: Install dependencies
33+
if: steps.cache-modules.outputs.cache-hit != 'true'
34+
run: |
35+
cd tools/@aws-cdk/project-sync
36+
yarn install --frozen-lockfile
37+
38+
# Cache build output
39+
- name: Cache build output
40+
uses: actions/cache@v4
41+
id: cache-build
42+
with:
43+
path: |
44+
tools/@aws-cdk/project-sync/lib/*.js
45+
tools/@aws-cdk/project-sync/bin/*.js
46+
key: ${{ runner.os }}-build-${{ hashFiles('tools/@aws-cdk/project-sync/lib', 'tools/@aws-cdk/project-sync/bin') }}
47+
restore-keys: |
48+
${{ runner.os }}-build-
49+
50+
- name: Build project-sync
51+
if: steps.cache-build.outputs.cache-hit != 'true'
52+
run: |
53+
cd tools/@aws-cdk/project-sync
54+
yarn build
55+
56+
- name: Run issue-sync
57+
env:
58+
GITHUB_TOKEN: ${{ secrets.PROJECT_SYNC_GITHUB_TOKEN }}
59+
ISSUE_NUMBER: ${{ github.event.issue.number }}
60+
REPOSITORY: ${{ github.repository }}
61+
PROJECT_NUMBER: ${{ vars.PROJECT_NUMBER || 302 }}
62+
run: |
63+
cd tools/@aws-cdk/project-sync
64+
node bin/issue-sync.js

‎.github/workflows/pr-build.yml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: PR Build
2+
3+
on:
4+
workflow_dispatch: {}
5+
merge_group: {}
6+
push:
7+
branches:
8+
- main
9+
- v2-release
10+
pull_request:
11+
branches:
12+
- main
13+
- v2-release
14+
15+
# For every PR, cancel any previous builds in progress
16+
# ... but for all other builds we keep them running
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.pull_request.number || github.run_id }}
19+
cancel-in-progress: true
20+
21+
jobs:
22+
pr-build:
23+
if: github.repository != 'aws/aws-cdk'
24+
runs-on: aws-cdk_ubuntu-latest_32-core
25+
26+
env:
27+
PR_BUILD: true
28+
29+
steps:
30+
- name: Checkout code
31+
uses: actions/checkout@v4
32+
33+
- name: Setup Node.js
34+
uses: actions/setup-node@v4
35+
with:
36+
node-version: "18"
37+
cache: "yarn"
38+
39+
- name: Set up Docker
40+
uses: docker/setup-buildx-action@v3
41+
42+
- name: Load Docker images
43+
id: docker-cache
44+
uses: actions/cache/restore@v4
45+
with:
46+
path: |
47+
~/.docker-images.tar
48+
key: docker-cache-${{ runner.os }}
49+
50+
- name: Restore Docker images
51+
if: ${{ steps.docker-cache.outputs.cache-hit }}
52+
run: docker image load --input ~/.docker-images.tar
53+
54+
- name: Cache build artifacts
55+
uses: actions/cache@v4
56+
with:
57+
path: |
58+
~/.s3buildcache
59+
key: s3buildcache-${{ runner.os }}
60+
61+
- name: Configure system settings
62+
run: |
63+
(command -v sysctl || sudo apt-get update && sudo apt-get install -y procps) && \
64+
sudo sysctl -w vm.max_map_count=2251954
65+
66+
- name: Build
67+
run: /bin/bash ./build.sh --ci
68+
69+
- name: Run Rosetta
70+
run: /bin/bash ./scripts/run-rosetta.sh
71+
72+
- name: Check for uncommitted changes
73+
run: git diff-index --exit-code --ignore-space-at-eol --stat HEAD
74+
75+
- name: Export Docker images
76+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
77+
run: docker image save --output ~/.docker-images.tar $(docker image list --format '{{ if ne .Repository "<none>" }}{{ .Repository }}{{ if ne .Tag "<none>" }}:{{ .Tag }}{{ end }}{{ else }}{{ .ID }}{{ end }}')
78+
79+
- name: Cache Docker images
80+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
81+
uses: actions/cache/save@v4
82+
with:
83+
path: |
84+
~/.docker-images.tar
85+
key: docker-cache-${{ runner.os }}

‎.github/workflows/spec-update.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: AWS Service Spec Update
22

33
on:
44
schedule:
5-
# Every Monday at 13:37 UTC
6-
- cron: 37 13 * * 1
5+
# Every Monday at 10:15 UTC since dependency releases are on Fridays : https://github.com/cdklabs/awscdk-service-spec/releases?q=-spec&expanded=true
6+
- cron: 15 10 * * 1
77
workflow_dispatch: {}
88

99
jobs:

‎.mergify.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# See https://doc.mergify.io
2+
merge_queue:
3+
# Hopefully this gets Mergify to stop creating PRs just to test merges (it both messes with statistics and our automatic validations)
4+
max_parallel_checks: 1
25
queue_rules:
36
- name: default-merge
47
update_method: merge
@@ -16,6 +19,7 @@ queue_rules:
1619
- "#changes-requested-reviews-by=0"
1720
- status-success~=AWS CodeBuild us-east-1
1821
- status-success=validate-pr
22+
- status-success=build
1923
commit_message_template: |-
2024
{{ title }} (#{{ number }})
2125
{{ body }}
@@ -36,6 +40,7 @@ queue_rules:
3640
- "#changes-requested-reviews-by=0"
3741
- status-success~=AWS CodeBuild us-east-1
3842
- status-success=validate-pr
43+
- status-success=build
3944
commit_message_template: |-
4045
{{ title }} (#{{ number }})
4146
{{ body }}
@@ -55,6 +60,7 @@ queue_rules:
5560
- "#changes-requested-reviews-by=0"
5661
- status-success~=AWS CodeBuild us-east-1
5762
- status-success=validate-pr
63+
- status-success=build
5864
commit_message_template: |-
5965
{{ title }} (#{{ number }})
6066
{{ body }}
@@ -65,7 +71,7 @@ pull_request_rules:
6571
label:
6672
add: [contribution/core]
6773
conditions:
68-
- author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|TheRealAmazonKendra|mrgrain|pahud|ashishdhingra|kellertk|moelasmar|paulhcsun|GavinZZ|xazhao|gracelu0|shikha372|QuantumNeuralCoder|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere|jiayiwang7|saiyush|5d|iankhou|SimonCMoore|maharajhaider|Y-JayKim|astiwana|ykethan|aemada-aws|ozelalisen|abogical|alinko-aws|vishaalmehrishi|alvazjor|kumsmrit|kumvprat|leonmk-aws|matboros|gasolima)$
74+
- author=@aws/aws-cdk-team
6975
- -label~="contribution/core"
7076
- name: automatic merge
7177
actions:
@@ -87,6 +93,7 @@ pull_request_rules:
8793
- "#changes-requested-reviews-by=0"
8894
- status-success~=AWS CodeBuild us-east-1
8995
- status-success=validate-pr
96+
- status-success=build
9097
- name: automatic priority merge
9198
actions:
9299
comment:
@@ -108,6 +115,7 @@ pull_request_rules:
108115
- "#changes-requested-reviews-by=0"
109116
- status-success~=AWS CodeBuild us-east-1
110117
- status-success=validate-pr
118+
- status-success=build
111119
- name: automatic merge (2+ approvers)
112120
actions:
113121
comment:
@@ -129,6 +137,7 @@ pull_request_rules:
129137
- "#changes-requested-reviews-by=0"
130138
- status-success~=AWS CodeBuild us-east-1
131139
- status-success=validate-pr
140+
- status-success=build
132141
- name: automatic merge (no-squash)
133142
actions:
134143
comment:
@@ -150,6 +159,7 @@ pull_request_rules:
150159
- "#changes-requested-reviews-by=0"
151160
- status-success~=AWS CodeBuild us-east-1
152161
- status-success=validate-pr
162+
- status-success=build
153163
- name: remove stale reviews
154164
actions:
155165
dismiss_reviews:
@@ -190,6 +200,7 @@ pull_request_rules:
190200
- "#changes-requested-reviews-by=0"
191201
- status-success~=AWS CodeBuild us-east-1
192202
- status-success=validate-pr
203+
- status-success=build
193204
priority_rules:
194205
- name: priority for queue `default-merge`
195206
conditions:

0 commit comments

Comments
 (0)