From 4379f469c0246027e57b9ec7160cc95341df0094 Mon Sep 17 00:00:00 2001
From: Otavio Macedo <288203+otaviomacedo@users.noreply.github.com>
Date: Fri, 4 Nov 2022 16:52:44 +0000
Subject: [PATCH 1/4] chore: save exlusion rules when bumping the CFN spec

---
 scripts/bump-cfnspec.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/bump-cfnspec.sh b/scripts/bump-cfnspec.sh
index f71f002785ff9..72c83362afabc 100755
--- a/scripts/bump-cfnspec.sh
+++ b/scripts/bump-cfnspec.sh
@@ -16,11 +16,8 @@ ${pwd}/install.sh
 # dependencies are in fact involved in the building of new construct libraries
 # created upon their introduction in the CFN Specification (they incur the
 # dependency, not `@aws-cdk/cfnspec` itself).
-yarn lerna run build --stream     \
-  --scope=@aws-cdk/cfnspec        \
-  --scope=@aws-cdk/cfn2ts         \
-  --scope=@aws-cdk/ubergen        \
-  --include-dependencies
+export AWSLINT_SAVE=true
+yarn lerna run build --stream --include-dependencies
 
 # Run the cfnspec update
 cd ${pwd}/packages/@aws-cdk/cfnspec

From 91c3c4bfdc5a3cae298ef522508490c316c6c412 Mon Sep 17 00:00:00 2001
From: Otavio Macedo <288203+otaviomacedo@users.noreply.github.com>
Date: Mon, 7 Nov 2022 10:47:16 +0000
Subject: [PATCH 2/4] Running the full build after yarn update

---
 scripts/bump-cfnspec.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/bump-cfnspec.sh b/scripts/bump-cfnspec.sh
index 72c83362afabc..2bb8064bc4d37 100755
--- a/scripts/bump-cfnspec.sh
+++ b/scripts/bump-cfnspec.sh
@@ -24,6 +24,10 @@ cd ${pwd}/packages/@aws-cdk/cfnspec
 yarn update
 version=$(cat cfn.version)
 
+# Running a full build saving awslint exclusion rules in case any of them fails
+export AWSLINT_SAVE=true
+yarn lerna run build --stream --include-dependencies
+
 # Come back to root, add all files to git and commit
 cd ${pwd}
 git add .

From 1bd94c9eba1e4a430e03b8bad5d36b779a856c40 Mon Sep 17 00:00:00 2001
From: Otavio Macedo <288203+otaviomacedo@users.noreply.github.com>
Date: Mon, 7 Nov 2022 11:36:36 +0000
Subject: [PATCH 3/4] Update bump-cfnspec.sh

---
 scripts/bump-cfnspec.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/bump-cfnspec.sh b/scripts/bump-cfnspec.sh
index 2bb8064bc4d37..6696f77b165eb 100755
--- a/scripts/bump-cfnspec.sh
+++ b/scripts/bump-cfnspec.sh
@@ -16,8 +16,12 @@ ${pwd}/install.sh
 # dependencies are in fact involved in the building of new construct libraries
 # created upon their introduction in the CFN Specification (they incur the
 # dependency, not `@aws-cdk/cfnspec` itself).
-export AWSLINT_SAVE=true
-yarn lerna run build --stream --include-dependencies
+yarn lerna run build --stream     \
+  --scope=@aws-cdk/cfnspec        \
+  --scope=@aws-cdk/cfn2ts         \
+  --scope=@aws-cdk/ubergen        \
+  --include-dependencies
+
 
 # Run the cfnspec update
 cd ${pwd}/packages/@aws-cdk/cfnspec

From 574804a8decc9f555b8174b76f0b8496a4b1d092 Mon Sep 17 00:00:00 2001
From: Otavio Macedo <288203+otaviomacedo@users.noreply.github.com>
Date: Mon, 7 Nov 2022 11:37:09 +0000
Subject: [PATCH 4/4] Update bump-cfnspec.sh

---
 scripts/bump-cfnspec.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/bump-cfnspec.sh b/scripts/bump-cfnspec.sh
index 6696f77b165eb..bec5e82aa4b44 100755
--- a/scripts/bump-cfnspec.sh
+++ b/scripts/bump-cfnspec.sh
@@ -22,7 +22,6 @@ yarn lerna run build --stream     \
   --scope=@aws-cdk/ubergen        \
   --include-dependencies
 
-
 # Run the cfnspec update
 cd ${pwd}/packages/@aws-cdk/cfnspec
 yarn update