From e627ae36bf1e1d7d582c83f722e9865d0a93ff2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20Fournier?= <gaston@getunleash.io>
Date: Mon, 13 Feb 2023 13:39:22 +0100
Subject: [PATCH] Test counting different branches

---
 .../workflows/gradual-strict-null-checks.yml  |  5 +++-
 scripts/gradual-strict-null-checks.sh         | 27 ++++++-------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/gradual-strict-null-checks.yml b/.github/workflows/gradual-strict-null-checks.yml
index 271042d49456..ff40832e88bd 100644
--- a/.github/workflows/gradual-strict-null-checks.yml
+++ b/.github/workflows/gradual-strict-null-checks.yml
@@ -26,4 +26,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'yarn'
-      - run: ./current/scripts/gradual-strict-null-checks.sh
\ No newline at end of file
+      - run: ./current/scripts/gradual-strict-null-checks.sh ./current > ./current-count
+      - run: ./current/scripts/gradual-strict-null-checks.sh ./main > ./main-count
+      - run: cat ./current-count
+      - run: cat ./main-count
\ No newline at end of file
diff --git a/scripts/gradual-strict-null-checks.sh b/scripts/gradual-strict-null-checks.sh
index 3baa82f3964a..22a1ab839f9f 100755
--- a/scripts/gradual-strict-null-checks.sh
+++ b/scripts/gradual-strict-null-checks.sh
@@ -1,24 +1,13 @@
 #!/usr/bin/env bash
-SCRIPT_DIR=$( dirname -- "$0" )
-CURRENT_BRANCH=$(git branch --show-current)
-MAIN_BRANCH_DIR=${1:-../main}
+set -e
+FOLDER="${1:-.}"
 
-# update strictNullChecks in main and current branch
-sed -i 's/\/\/\s*"strictNullChecks":\s*true,/"strictNullChecks": true,/' "${MAIN_BRANCH_DIR}/tsconfig.json"
-sed -i 's/\/\/\s*"strictNullChecks":\s*true,/"strictNullChecks": true,/' "${SCRIPT_DIR}/../tsconfig.json"
+cd "${FOLDER}"
 
-# count errors
-MAIN_ERRORS=$(cd "${MAIN_BRANCH}"; yarn 2> /dev/null | grep "Found [0-9]* errors" | sed 's/Found \(.*\) errors in .* files./\1/')
-BRANCH_ERRORS=$(yarn 2> /dev/null | grep "Found [0-9]* errors" | sed 's/Found \(.*\) errors in .* files./\1/')
+# update strictNullChecks
+sed -i 's/\/\/\s*"strictNullChecks":\s*true,/"strictNullChecks": true,/' "./tsconfig.json"
 
-# reset tsconfig changes
-git checkout -- "${SCRIPT_DIR}/../tsconfig.json"
-$(cd "${MAIN_BRANCH}"; git checkout -- tsconfig.json)
+# count errors
+ERRORS=$(yarn 2> /dev/null | grep "Found [0-9]* errors" | sed 's/Found \(.*\) errors in .* files./\1/')
 
-if [ $BRANCH_ERRORS -gt $MAIN_ERRORS ]; then
-    echo "Null check errors in ${CURRENT_BRANCH} are higher than in ${MAIN_BRANCH}: ${BRANCH_ERRORS} vs ${MAIN_ERRORS}. Please fix them before merging."
-    exit 1
-else
-    echo "Branch null check errors: ${BRANCH_ERRORS} vs ${MAIN_BRANCH}: ${MAIN_ERRORS} - You're good to go!"
-    exit 0
-fi
\ No newline at end of file
+echo ${ERRORS:-0}
\ No newline at end of file