Merge branch 'main' into feature/sagemaker-serverless-variants-23148

Author: abidhasan-aws

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

@@ -30,6 +30,7 @@ jobs:
 
     env:
       PR_BUILD: true
+      JSII_SILENCE_WARNING_DEPRECATED_NODE_VERSION: true
 
     steps:
       - name: Checkout code

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

@@ -7,6 +7,11 @@ on:
   workflow_dispatch: {}
   merge_group: {}
   pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
     branches:
       - main
     paths:
@@ -21,26 +26,18 @@ jobs:
   integration_test_deployment:
     runs-on: codebuild-aws-cdk-github-actions-deployment-integ-runner-${{ github.run_id }}-${{ github.run_attempt }}
     environment: deployment-integ-test # Do not change or remove this without discussing with Appsec
-    if: contains(github.event.pull_request.labels.*.name, 'pr/needs-integration-tests-deployment ')
+    if: contains(github.event.pull_request.labels.*.name, 'pr/needs-integration-tests-deployment')
     name: 'Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)'
 
     env:
       PR_BUILD: true
 
     steps:
-      - name: Checkout BASE
-        uses: actions/checkout@v5
-        with:
-          ref: ${{ github.event.pull_request.base.sha }}
-          fetch-depth: 0
-          path: base
-
       - name: Checkout HEAD
         uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
-          path: head
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v5
@@ -55,8 +52,7 @@ jobs:
           node-version: "lts/*"
           cache: "yarn"
           cache-dependency-path: |
-            base/yarn.lock
-            head/yarn.lock
+            yarn.lock
 
       - name: Set up Docker
         uses: docker/setup-buildx-action@v3
@@ -85,26 +81,18 @@ jobs:
         run: |
           (command -v sysctl || sudo apt-get update && sudo apt-get install -y procps) && \
           sudo sysctl -w vm.max_map_count=2251954
-
-      - name: Install dependencies for integration-test-deployment (BASE)
-        working-directory: base
-        run: yarn --cwd tools/@aws-cdk/integration-test-deployment install
-      
-      - name: Build deployment-integ (BASE)
-        working-directory: base
-        run: yarn --cwd tools/@aws-cdk/integration-test-deployment build
         
-      - name: Install dependencies for Integration Tests (HEAD)
-        working-directory: head
+      - name: Install dependencies for Integration Tests
         run: yarn install 
+      
+      - name: Build deployment-integ
+        run: yarn --cwd tools/@aws-cdk/integration-test-deployment build
 
-      - name: Build Integration Tests (HEAD)
-        working-directory: head
+      - name: Build Integration Tests
         run: npx lerna run build --scope=@aws-cdk-testing/framework-integ 
 
-      - name: Run integration tests from HEAD using integration-test-deployment script from BASE
-        run: yarn --cwd ../base/tools/@aws-cdk/integration-test-deployment/ integration-test-deployment
-        working-directory: head
+      - name: Run integration tests using integration-test-deployment script
+        run: yarn run atmosphere-integ-test
         env:
           CDK_ATMOSPHERE_ENDPOINT: ${{ vars.CDK_ATMOSPHERE_ENDPOINT }}
           CDK_ATMOSPHERE_POOL: ${{ vars.CDK_ATMOSPHERE_POOL}}

.github/workflows/pr-build.yml

@@ -25,6 +25,7 @@ jobs:
 
     env:
       PR_BUILD: true
+      JSII_SILENCE_WARNING_DEPRECATED_NODE_VERSION: true
 
     steps:
       - name: Checkout code

package.json

@@ -12,7 +12,8 @@
     "pack": "./pack.sh",
     "compat": "./scripts/check-api-compatibility.sh",
     "bump": "./bump.sh",
-    "build-all": "tsc -b"
+    "build-all": "tsc -b",
+    "atmosphere-integ-test": "lerna run build --scope @aws-cdk/integration-test-deployment && node tools/@aws-cdk/integration-test-deployment/bin/index.js"
   },
   "devDependencies": {
     "@nx/workspace": "^20",
@@ -25,9 +26,9 @@
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.11",
     "jest-junit": "^13.2.0",
-    "jsii-diff": "1.113.0",
-    "jsii-pacmak": "1.113.0",
-    "jsii-reflect": "1.113.0",
+    "jsii-diff": "1.116.0",
+    "jsii-pacmak": "1.116.0",
+    "jsii-reflect": "1.116.0",
     "lerna": "^8.2.4",
     "nx": "^20",
     "semver": "^7.7.2",