diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index fa4f1123a4..6a8a4e5b16 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -81,7 +81,7 @@ runs:
         echo "::set-output name=MATRIX::$matrix"
         echo "::set-output name=RUN_CLIENT::$run"
 
-        if [[ $run == 'false' && steps.diff.outputs.JS_COMMON_CHANGED > 0 ]]; then
+        if [[ $base_changed == 'true' || steps.diff.outputs.JS_COMMON_CHANGED > 0 ]]; then
           echo "::set-output name=RUN_COMMON::true"
         fi
 
diff --git a/scripts/builds/clients.sh b/scripts/builds/clients.sh
index 25a03b8a6c..1a65602cac 100755
--- a/scripts/builds/clients.sh
+++ b/scripts/builds/clients.sh
@@ -20,11 +20,9 @@ fi
 # Commands are based on the LANGUAGE
 if [[ $LANGUAGE == 'javascript' ]]; then
     echo "> Cleaning previous build $GENERATOR..."
-
     yarn workspace $PACKAGE clean
 
     echo "> Bundling $GENERATOR..."
-
     CMD="yarn workspace $PACKAGE build"
 elif [[ $LANGUAGE == 'php' ]]; then
     # no build needed (for now)
diff --git a/scripts/post-gen/global.sh b/scripts/post-gen/global.sh
index 69c795f829..0181cd848a 100755
--- a/scripts/post-gen/global.sh
+++ b/scripts/post-gen/global.sh
@@ -6,6 +6,8 @@ set -e
 LANGUAGE=$1
 
 if [[ $CI ]]; then
+    echo "Not running post-gen/global on CI for $LANGUAGE"
+
     exit 0
 fi