Skip to content

Commit 2c27e56

Browse files
authored
Merge branch 'main' into createemrclusteroption
2 parents 96e6342 + ec18b83 commit 2c27e56

File tree

4,051 files changed

+3085774
-2637197
lines changed

Some content is hidden

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

4,051 files changed

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

.github/workflows/codecov-upload.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ jobs:
2020
github.event.workflow_run.conclusion == 'success'
2121
2222
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v4
2325
- name: Download Artifacts
24-
uses: actions/download-artifact@v4
26+
uses: actions/download-artifact@v5
2527
with:
2628
name: coverage-artifacts
2729
path: ./packages/aws-cdk-lib/core/coverage

.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/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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ concurrency:
1919
cancel-in-progress: true
2020

2121
jobs:
22-
build:
22+
pr-build:
23+
if: github.repository != 'aws/aws-cdk'
2324
runs-on: aws-cdk_ubuntu-latest_32-core
2425

2526
env:

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22

33
name: request-cli-integ-test
44
on:
5-
pull_request_target: {}
5+
pull_request_target:
6+
types:
7+
- opened
8+
- synchronize
9+
- reopened
10+
- labeled
11+
- unlabeled
612

713
jobs:
814
cli-changes:
@@ -28,7 +34,7 @@ jobs:
2834
submit-to-test-pipeline:
2935
environment: test-pipeline
3036
needs: cli-changes
31-
if: needs.cli-changes.outputs.any-changed-files == 'true'
37+
if: needs.cli-changes.outputs.any-changed-files == 'true' || contains(github.event.pull_request.labels.*.name, 'pr/request-cli-integ-tests')
3238
runs-on: ubuntu-latest
3339
steps:
3440
- name: Checkout

.github/workflows/spec-update.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ jobs:
8585
CI: "true"
8686
steps:
8787
- name: Download base database
88-
uses: actions/download-artifact@v4
88+
uses: actions/download-artifact@v5
8989
with:
9090
name: db.base.json.gz
9191
path: base
9292
- name: Download head database
93-
uses: actions/download-artifact@v4
93+
uses: actions/download-artifact@v5
9494
with:
9595
name: db.head.json.gz
9696
path: head
@@ -128,7 +128,7 @@ jobs:
128128
uses: actions/checkout@v4
129129

130130
- name: Download patch
131-
uses: actions/download-artifact@v4
131+
uses: actions/download-artifact@v5
132132
with:
133133
name: update-spec.patch
134134
path: ${{ runner.temp }}
@@ -137,7 +137,7 @@ jobs:
137137
run: '[ -s ${{ runner.temp }}/update-spec.patch ] && git apply ${{ runner.temp }}/update-spec.patch || echo "Empty patch. Skipping."'
138138

139139
- name: Download PR body file
140-
uses: actions/download-artifact@v4
140+
uses: actions/download-artifact@v5
141141
with:
142142
name: PR.md
143143
path: ${{ runner.temp }}

.github/workflows/update-metadata-regions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: actions/checkout@v4
5151

5252
- name: Download patch
53-
uses: actions/download-artifact@v4
53+
uses: actions/download-artifact@v5
5454
with:
5555
name: update-spec.patch
5656
path: ${{ runner.temp }}

0 commit comments

Comments
 (0)