Skip to content

Commit 0d44eb9

Browse files
authored
Merge branch 'main' into mrgrain/ci/require-build-mergify
2 parents e34f29b + 6a5e7ab commit 0d44eb9

File tree

36 files changed

+44
-38
lines changed

36 files changed

+44
-38
lines changed

.github/workflows/pr-build.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
name: PR Build
22

33
on:
4+
workflow_dispatch: {}
5+
merge_group: {}
6+
push:
7+
branches:
8+
- main
9+
- v2-release
410
pull_request:
511
branches:
612
- main
713
- v2-release
814

915
jobs:
1016
build:
11-
runs-on: aws-cdk_ubuntu-latest_16-core
17+
runs-on: aws-cdk_ubuntu-latest_32-core
1218

1319
env:
1420
PR_BUILD: true
@@ -18,7 +24,7 @@ jobs:
1824
uses: actions/checkout@v4
1925

2026
- name: Setup Node.js
21-
uses: actions/setup-node@v3
27+
uses: actions/setup-node@v4
2228
with:
2329
node-version: "18"
2430
cache: "yarn"
@@ -31,7 +37,7 @@ jobs:
3137
# run: /root/ecr-proxy/start.sh
3238

3339
- name: Cache build artifacts
34-
uses: actions/cache@v3
40+
uses: actions/cache@v4
3541
with:
3642
path: |
3743
~/.s3buildcache

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"lint": "cdk-lint",
1010
"pkglint": "pkglint -f",
1111
"test": "cdk-test",
12-
"integ": "integ-runner --language javascript",
12+
"integ": "integ-runner --unstable=toolkit-lib-engine --language javascript",
1313
"package": "cdk-package",
1414
"build+test": "yarn build && yarn test",
1515
"build+extract": "yarn build",

packages/@aws-cdk/app-staging-synthesizer-alpha/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner --unstable=toolkit-lib-engine --language javascript",
5656
"pkglint": "pkglint -f",
5757
"package": "cdk-package",
5858
"awslint": "cdk-awslint",

packages/@aws-cdk/aws-amplify-alpha/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"homepage": "https://github.com/aws/aws-cdk",
5151
"scripts": {
5252
"build": "cdk-build",
53-
"integ": "integ-runner --language javascript",
53+
"integ": "integ-runner --unstable=toolkit-lib-engine --language javascript",
5454
"lint": "cdk-lint",
5555
"package": "cdk-package",
5656
"awslint": "cdk-awslint",

packages/@aws-cdk/aws-applicationsignals-alpha/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"homepage": "https://github.com/aws/aws-cdk",
5151
"scripts": {
5252
"build": "cdk-build",
53-
"integ": "integ-runner --language javascript",
53+
"integ": "integ-runner --unstable=toolkit-lib-engine --language javascript",
5454
"lint": "cdk-lint",
5555
"package": "cdk-package",
5656
"awslint": "cdk-awslint",

packages/@aws-cdk/aws-apprunner-alpha/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"watch": "cdk-watch",
5555
"lint": "cdk-lint",
5656
"test": "cdk-test",
57-
"integ": "integ-runner --language javascript",
57+
"integ": "integ-runner --unstable=toolkit-lib-engine --language javascript",
5858
"pkglint": "pkglint -f",
5959
"package": "cdk-package",
6060
"awslint": "cdk-awslint",

packages/@aws-cdk/aws-bedrock-alpha/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner --unstable=toolkit-lib-engine --language javascript",
5656
"pkglint": "pkglint -f",
5757
"package": "cdk-package",
5858
"awslint": "cdk-awslint",

packages/@aws-cdk/aws-cloud9-alpha/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner --unstable=toolkit-lib-engine --language javascript",
5656
"pkglint": "pkglint -f",
5757
"package": "cdk-package",
5858
"awslint": "cdk-awslint",

packages/@aws-cdk/aws-codestar-alpha/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"homepage": "https://github.com/aws/aws-cdk",
5151
"scripts": {
5252
"build": "cdk-build",
53-
"integ": "integ-runner --language javascript",
53+
"integ": "integ-runner --unstable=toolkit-lib-engine --language javascript",
5454
"lint": "cdk-lint",
5555
"package": "cdk-package",
5656
"awslint": "cdk-awslint",

packages/@aws-cdk/aws-ec2-alpha/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner --unstable=toolkit-lib-engine --language javascript",
5656
"pkglint": "pkglint -f",
5757
"awslint": "cdk-awslint",
5858
"package": "cdk-package",

0 commit comments

Comments
 (0)