Merge branch 'main' into alb-ipv6

aws · May 17, 2024 · f1706e2 · f1706e2
2 parents 5f6604f + 1ba6e87
commit f1706e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/...s/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.142.0/NOTES.md b/...s/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.142.0/NOTES.md
@@ -0,0 +1 @@
+This patch brings the [fix](https://github.com/aws/aws-cdk/issues/30241) into the regression suite.
diff --git a/packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.142.0/skip-tests.txt b/packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.142.0/skip-tests.txt
@@ -0,0 +1,4 @@
+# Skipping the test to fix issue https://github.com/aws/aws-cdk/issues/30241. 
+# cli-integ tests failing for the old tests with the new cli changes for diff stacks.
+
+cdk diff picks up changes that are only present in changeset