Skip to content

Commit 51d6893

Browse files
authored
Merge branch 'main' into merge-back/2.207.0
2 parents 259837f + d996227 commit 51d6893

File tree

39 files changed

+2061
-389
lines changed

39 files changed

+2061
-389
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/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@v3
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@v3
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

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
"tools/@aws-cdk/prlint",
8585
"tools/@aws-cdk/spec2cdk",
8686
"tools/@aws-cdk/lazify",
87+
"tools/@aws-cdk/project-sync",
8788
"tools/@aws-cdk/lambda-integration-test-updater",
8889
"tools/@aws-cdk/construct-metadata-updater",
8990
"scripts/@aws-cdk/script-tests"

packages/@aws-cdk-testing/framework-integ/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@aws-sdk/client-rds": "3.632.0",
3737
"@aws-sdk/client-s3": "3.632.0",
3838
"@aws-sdk/client-cognito-identity-provider": "3.632.0",
39-
"axios": "1.10.0",
39+
"axios": "1.11.0",
4040
"delay": "5.0.0"
4141
},
4242
"dependencies": {
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"/": "If you need to regenerate the lockfile, temporarily rename this file to package.json",
3+
"dependencies": {
4+
"axios": "1.11.0"
5+
}
6+
}

packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ-handlers/pnpm/pnpm-lock.yaml

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

packages/@aws-cdk/custom-resource-handlers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"sinon": "^9.2.4",
5454
"nock": "^13.5.6",
5555
"fs-extra": "^11.3.0",
56-
"esbuild": "^0.25.5"
56+
"esbuild": "^0.25.0"
5757
},
5858
"dependencies": {
5959
"@aws-cdk/asset-node-proxy-agent-v6": "^2.1.0",

packages/aws-cdk-lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
"cdk8s": "2.69.74",
173173
"constructs": "^10.0.0",
174174
"delay": "5.0.0",
175-
"esbuild": "^0.25.5",
175+
"esbuild": "^0.25.0",
176176
"fast-check": "^3.23.2",
177177
"jest": "^29.7.0",
178178
"jest-each": "^29.7.0",

tools/@aws-cdk/construct-metadata-updater/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"cjs-module-lexer": "^1.4.3"
2424
},
2525
"dependencies": {
26-
"esbuild": "^0.25.5",
26+
"esbuild": "^0.25.0",
2727
"ts-morph": "~24.0.0"
2828
},
2929
"main": "lib/index.js",

tools/@aws-cdk/enum-updater/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"watch": "tsc --build -w tsconfig.json"
1717
},
1818
"devDependencies": {
19-
"@types/axios": "^0.14.4",
2019
"@types/jest": "^29.5.14",
2120
"@types/node": "^16",
2221
"@types/tmp": "^0.2.6",
@@ -27,8 +26,8 @@
2726
"typescript": "~5.5.4"
2827
},
2928
"dependencies": {
30-
"axios": "^1.8.3",
31-
"esbuild": "^0.25.0",
29+
"axios": "^1.11.0",
30+
"esbuild": "^0.25.8",
3231
"extract-zip": "^2.0.1",
3332
"tmp": "^0.2.1",
3433
"ts-morph": "~24.0.0"

0 commit comments

Comments
 (0)