Skip to content

Commit 368f92a

Browse files
Merge remote-tracking branch 'origin/main' into regional-natgw
2 parents 184729c + a85d470 commit 368f92a

File tree

4,919 files changed

+2217882
-1798905
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,919 files changed

+2217882
-1798905
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.zip binary
88
*.png binary
99
*.jpg binary
10+
*.tar binary
1011
*.tgz binary
1112
*.tar.gz binary
1213
# Hide snapshots from GitHub UI, except for the actual templates

.github/workflows/analytics-metadata-updater.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,22 @@ jobs:
4343
4444
- name: Commit & Push changes
4545
if: steps.git-check.outputs.changes == 'true'
46+
env:
47+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48+
PR_HEAD: ${{ github.event.pull_request.head.ref }}
4649
run: |
4750
git config --global user.name 'aws-cdk-automation'
4851
git config --global user.email 'aws-cdk-automation@users.noreply.github.com'
4952
50-
git fetch origin ${{ github.event.pull_request.head.ref }}
53+
git fetch origin "$PR_HEAD"
5154
52-
if [ "$(git rev-parse HEAD)" != "$(git rev-parse origin/${{ github.event.pull_request.head.ref }})" ]; then
55+
PR_HEAD_REV="$(git rev-parse origin/"$PR_HEAD")"
56+
if [ "$(git rev-parse HEAD)" != "$PR_HEAD_REV" ]; then
5357
echo "Remote branch updated since approved commit; aborting."
5458
exit 1
5559
fi
5660
57-
git checkout -B ${{ github.event.pull_request.head.ref }}
61+
git checkout -B "$PR_HEAD"
5862
git add .
5963
git commit -m "chore: update analytics metadata blueprints"
60-
git push origin ${{ github.event.pull_request.head.ref }}
61-
env:
62-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
64+
git push origin "$PR_HEAD"

.github/workflows/check-lfs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: Check all requires files are in LFS
22
on:
33
pull_request: {}
44

5+
permissions:
6+
contents: read
7+
58
jobs:
69
check-lfs:
710
runs-on: ubuntu-latest

.github/workflows/close-stale-prs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
permissions:
1111
pull-requests: write
1212
runs-on: ubuntu-latest
13+
environment: automation
1314
steps:
1415
- uses: cdklabs/close-stale-prs@main
1516
with:

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ concurrency:
2222
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.pull_request.number || github.run_id }}
2323
cancel-in-progress: true
2424

25+
permissions:
26+
contents: read
27+
2528
jobs:
2629
build:
2730
# Runner exists only for aws-cdk repo
@@ -43,7 +46,7 @@ jobs:
4346
cache: "yarn"
4447

4548
- name: Set up Docker
46-
uses: docker/setup-buildx-action@v3
49+
uses: docker/setup-buildx-action@v4
4750

4851
- name: Load Docker images
4952
id: docker-cache
@@ -102,7 +105,7 @@ jobs:
102105
103106
- name: Upload PR info artifact
104107
if: github.event_name == 'pull_request'
105-
uses: actions/upload-artifact@v6
108+
uses: actions/upload-artifact@v7
106109
with:
107110
name: pr_info
108111
path: pr/

.github/workflows/codecov-collect.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: cd packages/aws-cdk-lib && yarn test core
2929

3030
- name: Upload Coverage and PR Info
31-
uses: actions/upload-artifact@v6
31+
uses: actions/upload-artifact@v7
3232
with:
3333
name: coverage-artifacts
3434
path: |

.github/workflows/codecov-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Checkout
2424
uses: actions/checkout@v6
2525
- name: Download Artifacts
26-
uses: actions/download-artifact@v7
26+
uses: actions/download-artifact@v8
2727
with:
2828
name: coverage-artifacts
2929
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
@@ -23,7 +23,7 @@ jobs:
2323
NODE_OPTIONS: "--max-old-space-size=8196 --experimental-worker ${NODE_OPTIONS:-}"
2424

2525
- name: Install dependencies
26-
run: cd tools/@aws-cdk/enum-updater && yarn install --frozen-lockfile && yarn build
26+
run: yarn install --frozen-lockfile && cd tools/@aws-cdk/enum-updater && yarn build
2727

2828
- name: Identify Missing Values and Apply Code Changes
2929
run: |

.github/workflows/integration-test-deployment-auto.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
id: check_team
6060
if: steps.check_snapshots.outputs.has_snapshots == 'true'
6161
env:
62-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62+
GITHUB_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }}
6363
APPROVER: ${{ github.event.review.user.login }}
6464
run: |
6565
# Use gh CLI to check team membership (pre-installed in GitHub Actions runners)
@@ -107,7 +107,7 @@ jobs:
107107
yarn.lock
108108
109109
- name: Set up Docker
110-
uses: docker/setup-buildx-action@v3
110+
uses: docker/setup-buildx-action@v4
111111

112112
- name: Load Docker images
113113
id: docker-cache
@@ -152,6 +152,6 @@ jobs:
152152
TARGET_BRANCH_COMMIT: ${{ github.event.pull_request.base.sha }}
153153
SOURCE_BRANCH_COMMIT: ${{ github.event.pull_request.head.sha }}
154154
# GitHub context for preflight check (validates CDK team membership)
155-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
155+
GITHUB_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }}
156156
GITHUB_REPOSITORY: ${{ github.repository }}
157157
PR_NUMBER: ${{ github.event.pull_request.number }}

.github/workflows/integration-test-deployment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
yarn.lock
5050
5151
- name: Set up Docker
52-
uses: docker/setup-buildx-action@v3
52+
uses: docker/setup-buildx-action@v4
5353

5454
- name: Load Docker images
5555
id: docker-cache

0 commit comments

Comments
 (0)