Set default before early exiting

Author: llrs-roche

.github/workflows/build-check-install.yaml

@@ -543,13 +543,24 @@ jobs:
           # Bash script run
           commit_msg=$( git log -1 --pretty=%B )
 
+          # Set default TESTING_DEPTH
+          td=$TESTING_DEPTH
+          if [ -z "$td" ]
+          then {
+            echo "No TESTING_DEPTH default"
+            echo "TESTING_DEPTH=5" >> "$GITHUB_ENV"
+            td=5
+          } fi
+
           echo "Commit msg is: ${commit_msg}"
           # Exit early if tag is on commit message even if it set to true
           test_all=$( echo "${commit_msg}" | grep -zvF "[run-all-tests]" | tr -d '\0')
 
           if [ -z "$test_all" ]
           then {
             echo "Last commit message forces to test everything."
+            echo Using "TESTING_DEPTH=$td"
+            echo "TESTING_DEPTH=$td" >> "$GITHUB_ENV"
             exit 0
           } fi
 
@@ -558,18 +569,11 @@ jobs:
           if [ -z "$ALL_CHANGED_FILES" ]
           then {
             echo "No R files affected: test everything."
+            echo Using "TESTING_DEPTH=$td"
+            echo "TESTING_DEPTH=$td" >> "$GITHUB_ENV"
             exit 0
           } fi
 
-          # Set default TESTING_DEPTH
-          td=$TESTING_DEPTH
-          if [ -z "$td" ]
-          then {
-            echo "No TESTING_DEPTH default"
-            td=5
-          } fi
-
-          echo "$ALL_CHANGED_FILES"
           # Loop through each modified file and determine which tests to run
           for file in $ALL_CHANGED_FILES; do
 
@@ -580,31 +584,27 @@ jobs:
               # R/foo.R -> foo
               base_name=$(basename "$file" .R | sed s/test-shinytest2-//g)
               # Find matching test files (parenthesis to not match arguments)
-              test_files=$(grep -l "$base_name(" "$test_dir"test-shinytest2-*.R)
-
+              test_files=$(grep -l "$base_name(" "$test_dir"test-shinytest2-*.R || echo "")
               # Modify in place so that only modified modules are tested.
-              if [ -n "$test_files" ];
+              if [ -z "$test_files" ];
               then {
-                  sed -i 's/skip_if_too_deep(5)/skip_if_too_deep(3)/g' "$test_files"
-                  TESTING_DEPTH="3"
-                  echo "Testing with shinytest2 for $test_files";
-              } else {
-                  # Flag for helpers
-                  helper_modified="yes"
                   git restore $test_dir
                   echo "Run all tests"
-                  break;
-              } fi
-
-              # R file without corresponding test file: reset the testing depth
-              if [ -n "$helper_modified" ] || [ -z "$test_all" ];
-              then {
-                  echo "Skip step or helper modifications detected."
+                  echo "Helper modifications detected."
                   TESTING_DEPTH="$td";
+                  break;
+              } else {
+                if [ -n "$test_files" ];
+                  then {
+                      sed -i 's/skip_if_too_deep(5)/skip_if_too_deep(3)/g' "$test_files"
+                      TESTING_DEPTH="3"
+                      echo "Testing with shinytest2 for $test_files";
+                  } else {
+                      echo "Something unexpected happened"
+                  } fi
               } fi
           done
 
-          # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions#setting-an-environment-variable
           echo Using "TESTING_DEPTH=${TESTING_DEPTH}"
           echo "TESTING_DEPTH=${TESTING_DEPTH}" >> "$GITHUB_ENV"
         shell: bash