From 0e235f9aa48500cd3e10cc5194370e51d805a963 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Thu, 3 Oct 2024 16:18:11 -0300
Subject: [PATCH] fix(json): Skip requirements if libs are not installed

---
 .github/scripts/sketch_utils.sh   | 39 +++++++++++++++++++------------
 .github/scripts/tests_run.sh      | 19 +++++++--------
 .github/workflows/tests_build.yml |  1 +
 .github/workflows/tests_hw.yml    |  4 ----
 4 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/.github/scripts/sketch_utils.sh b/.github/scripts/sketch_utils.sh
index 8316c328e9c..47d9271e171 100755
--- a/.github/scripts/sketch_utils.sh
+++ b/.github/scripts/sketch_utils.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-SDKCONFIG_DIR="$ARDUINO_ESP32_PATH/tools/esp32-arduino-libs"
+if [ -d "$ARDUINO_ESP32_PATH/tools/esp32-arduino-libs" ]; then
+    SDKCONFIG_DIR="$ARDUINO_ESP32_PATH/tools/esp32-arduino-libs"
+elif [ -d "$GITHUB_WORKSPACE/tools/esp32-arduino-libs" ]; then
+    SDKCONFIG_DIR="$GITHUB_WORKSPACE/tools/esp32-arduino-libs"
+else
+    SDKCONFIG_DIR="tools/esp32-arduino-libs"
+fi
 
 function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [extra-options]
     while [ ! -z "$1" ]; do
@@ -278,10 +284,11 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
     unset options
 }
 
-function count_sketches(){ # count_sketches <path> [target] [file]
+function count_sketches(){ # count_sketches <path> [target] [file] [ignore-requirements]
     local path=$1
     local target=$2
-    local file=$3
+    local ignore_requirements=$3
+    local file=$4
 
     if [ $# -lt 1 ]; then
       echo "ERROR: Illegal number of parameters"
@@ -294,7 +301,7 @@ function count_sketches(){ # count_sketches <path> [target] [file]
         return 0
     fi
 
-    if [ -n "$file" ]; then
+    if [ -f "$file" ]; then
         local sketches=$(cat $file)
     else
         local sketches=$(find $path -name *.ino | sort)
@@ -314,16 +321,18 @@ function count_sketches(){ # count_sketches <path> [target] [file]
                 continue
             fi
 
-            # Check if the sketch requires any configuration options
-            requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
-            if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
-                for requirement in $requirements; do
-                    requirement=$(echo $requirement | xargs)
-                    found_line=$(grep -E "^$requirement" $SDKCONFIG_DIR/$target/sdkconfig)
-                    if [[ "$found_line" == "" ]]; then
-                        continue 2
-                    fi
-                done
+            if [ "$ignore_requirements" != "1" ]; then
+                # Check if the sketch requires any configuration options
+                requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
+                if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
+                    for requirement in $requirements; do
+                        requirement=$(echo $requirement | xargs)
+                        found_line=$(grep -E "^$requirement" $SDKCONFIG_DIR/$target/sdkconfig)
+                        if [[ "$found_line" == "" ]]; then
+                            continue 2
+                        fi
+                    done
+                fi
             fi
         fi
         echo $sketch >> sketches.txt
@@ -401,7 +410,7 @@ function build_sketches(){ # build_sketches <ide_path> <user_path> <target> <pat
 
     set +e
     if [ -n "$sketches_file" ]; then
-        count_sketches "$path" "$target" "$sketches_file"
+        count_sketches "$path" "$target" "0" "$sketches_file"
         local sketchcount=$?
     else
         count_sketches "$path" "$target"
diff --git a/.github/scripts/tests_run.sh b/.github/scripts/tests_run.sh
index be084e90ce2..63ab2ca6dad 100755
--- a/.github/scripts/tests_run.sh
+++ b/.github/scripts/tests_run.sh
@@ -19,6 +19,12 @@ function run_test() {
         len=1
     fi
 
+    if [ $len -eq 1 ]; then
+        SDKCONFIG_PATH="$HOME/.arduino/tests/$sketchname/build.tmp/sdkconfig"
+    else
+        SDKCONFIG_PATH="$HOME/.arduino/tests/$sketchname/build0.tmp/sdkconfig"
+    fi
+
     if [ -f $sketchdir/ci.json ]; then
         # If the target or platform is listed as false, skip the sketch. Otherwise, include it.
         is_target=$(jq -r --arg target $target '.targets[$target]' $sketchdir/ci.json)
@@ -30,16 +36,6 @@ function run_test() {
             return 0
         fi
 
-        if [ -d $ARDUINO_ESP32_PATH/tools/esp32-arduino-libs ]; then
-            SDKCONFIG_PATH="$ARDUINO_ESP32_PATH/tools/esp32-arduino-libs/$target/sdkconfig"
-        else
-            if [ $len -eq 1 ]; then
-                SDKCONFIG_PATH="$HOME/.arduino/tests/$sketchname/build.tmp/sdkconfig"
-            else
-                SDKCONFIG_PATH="$HOME/.arduino/tests/$sketchname/build0.tmp/sdkconfig"
-            fi
-        fi
-
         # Check if the sketch requires any configuration options
         requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
         if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
@@ -233,7 +229,8 @@ else
   fi
 
   set +e
-  ${COUNT_SKETCHES} $test_folder $target
+  # Ignore requirements as we don't have the libs. The requirements will be checked in the run_test function
+  ${COUNT_SKETCHES} "$test_folder" "$target" "1"
   sketchcount=$?
   set -e
   sketches=$(cat sketches.txt)
diff --git a/.github/workflows/tests_build.yml b/.github/workflows/tests_build.yml
index b02e23ebd70..090dfa8136b 100644
--- a/.github/workflows/tests_build.yml
+++ b/.github/workflows/tests_build.yml
@@ -29,6 +29,7 @@ jobs:
             ~/.arduino/tests/**/build*.tmp/*.bin
             ~/.arduino/tests/**/build*.tmp/*.elf
             ~/.arduino/tests/**/build*.tmp/*.json
+            ~/.arduino/tests/**/build*.tmp/sdkconfig
 
       - name: Evaluate if tests should be built
         id: check-build
diff --git a/.github/workflows/tests_hw.yml b/.github/workflows/tests_hw.yml
index ec0619685b2..d7922500f10 100644
--- a/.github/workflows/tests_hw.yml
+++ b/.github/workflows/tests_hw.yml
@@ -59,10 +59,6 @@ jobs:
           sparse-checkout: |
             *
 
-      - name: List files
-        if: ${{ steps.check-tests.outputs.enabled == 'true' }}
-        run: ls -la
-
       # setup-python currently only works on ubuntu images
       # - uses: actions/setup-python@v5
       #   if: ${{ steps.check-tests.outputs.enabled == 'true' }}