Update sketch_utils.sh

Author: P-R-O-C-H-Y

.github/scripts/sketch_utils.sh

@@ -31,6 +31,10 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
             shift
             chunk_index=$1
             ;;
+        -l )
+            shift
+            log_compilation=$1
+            ;;
         * )
             break
             ;;
@@ -144,13 +148,9 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
         build_dir="$HOME/.arduino/tests/$sketchname/build.tmp"
     fi
 
-    echo "Chunk index = $chunk_index"
-
-    log_file="$HOME/.arduino/cli_compile_output.txt"
+    output_file="$HOME/.arduino/cli_compile_output.txt"
     sizes_file="$GITHUB_WORKSPACE/cli_compile_$chunk_index.json"
 
-    echo "Sizes file = $sizes_file"
-
     mkdir -p "$ARDUINO_CACHE_DIR"
     for i in `seq 0 $(($len - 1))`
     do
@@ -176,38 +176,37 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
                 --build-cache-path "$ARDUINO_CACHE_DIR" \
                 --build-path "$build_dir" \
                 $xtra_opts "${sketchdir}" \
-                > $log_file
+                > $output_file
 
             exit_status=$?
             if [ $exit_status -ne 0 ]; then
                 echo ""ERROR: Compilation failed with error code $exit_status""
                 exit $exit_status
             fi
 
-            #Extract the program storage space and dynamic memory usage in bytes and percentage in separate variables from the output, just the value without the string
-            flash_bytes=$(grep -oE 'Sketch uses ([0-9]+) bytes' $log_file | awk '{print $3}')
-            flash_percentage=$(grep -oE 'Sketch uses ([0-9]+) bytes \(([0-9]+)%\)' $log_file | awk '{print $5}' | tr -d '(%)')
-            ram_bytes=$(grep -oE 'Global variables use ([0-9]+) bytes' $log_file | awk '{print $4}')
-            ram_percentage=$(grep -oE 'Global variables use ([0-9]+) bytes \(([0-9]+)%\)' $log_file | awk '{print $6}' | tr -d '(%)')
-
-            # Extract the directory path excluding the filename
-            directory_path=$(dirname "$sketch")
-            echo "Debug (sketch)- directory path = $directory_path"
-            # Define the constant part
-            constant_part="/home/runner/Arduino/hardware/espressif/esp32/libraries/"
-            echo "Debug (sketch)- constant part = $constant_part"
-            # Extract the desired substring using sed
-            lib_sketch_name=$(echo "$directory_path" | sed "s|$constant_part||")
-            echo "Debug (sketch)- extracted path = $lib_sketch_name"
-            #append json file where key is fqbn, sketch name, sizes -> extracted values
-            echo "{\"name\": \"$lib_sketch_name\", 
-                   \"sizes\": [{
-                        \"flash_bytes\": $flash_bytes, 
-                        \"flash_percentage\": $flash_percentage, 
-                        \"ram_bytes\": $ram_bytes, 
-                        \"ram_percentage\": $ram_percentage
-                        }]
-                  }," >> "$sizes_file"
+            if [ $log_compilation ]; then
+                #Extract the program storage space and dynamic memory usage in bytes and percentage in separate variables from the output, just the value without the string
+                flash_bytes=$(grep -oE 'Sketch uses ([0-9]+) bytes' $output_file | awk '{print $3}')
+                flash_percentage=$(grep -oE 'Sketch uses ([0-9]+) bytes \(([0-9]+)%\)' $output_file | awk '{print $5}' | tr -d '(%)')
+                ram_bytes=$(grep -oE 'Global variables use ([0-9]+) bytes' $output_file | awk '{print $4}')
+                ram_percentage=$(grep -oE 'Global variables use ([0-9]+) bytes \(([0-9]+)%\)' $output_file | awk '{print $6}' | tr -d '(%)')
+
+                # Extract the directory path excluding the filename
+                directory_path=$(dirname "$sketch")
+                # Define the constant part
+                constant_part="/home/runner/Arduino/hardware/espressif/esp32/libraries/"
+                # Extract the desired substring using sed
+                lib_sketch_name=$(echo "$directory_path" | sed "s|$constant_part||")
+                #append json file where key is fqbn, sketch name, sizes -> extracted values
+                echo "{\"name\": \"$lib_sketch_name\", 
+                    \"sizes\": [{
+                            \"flash_bytes\": $flash_bytes, 
+                            \"flash_percentage\": $flash_percentage, 
+                            \"ram_bytes\": $ram_bytes, 
+                            \"ram_percentage\": $ram_percentage
+                            }]
+                    }," >> "$sizes_file"
+            fi
 
         elif [ -f "$ide_path/arduino-builder" ]; then
             echo "Building $sketchname with arduino-builder and FQBN=$currfqbn"
@@ -384,13 +383,18 @@ function build_sketches(){ # build_sketches <ide_path> <user_path> <target> <pat
     echo "End Sketch  : $end_index"
 
     sizes_file="$GITHUB_WORKSPACE/cli_compile_$chunk_index.json"
-    #echo board,target and start of sketches to sizes_file json
-    echo "{ \"board\": \"$fqbn\",
-            \"target\": \"$target\", 
-            \"sketches\": [" >> "$sizes_file"
+    if [ $log_compilation ]; then
+        #echo board,target and start of sketches to sizes_file json
+        echo "{ \"board\": \"$fqbn\",
+                \"target\": \"$target\", 
+                \"sketches\": [" >> "$sizes_file"
+    fi
 
     local sketchnum=0
     args+=" -ai $ide_path -au $user_path -i $chunk_index"
+    if [ $log_compilation ]; then
+        args+=" -l $log_compilation"
+    fi
     for sketch in $sketches; do
         local sketchdir=$(dirname $sketch)
         local sketchdirname=$(basename $sketchdir)
@@ -407,14 +411,17 @@ function build_sketches(){ # build_sketches <ide_path> <user_path> <target> <pat
             return $result
         fi
     done
-    echo "Debug (sketch)- removing last comma from the last JSON object"
-    if [ $i -eq $(($len - 1)) ]; then
-        sed -i '$ s/.$//' "$sizes_file"
+
+    if [ $log_compilation ]; then
+        #remove last comma from json
+        if [ $i -eq $(($len - 1)) ]; then
+            sed -i '$ s/.$//' "$sizes_file"
+        fi
+        #echo end of sketches sizes_file json
+        echo "]" >> "$sizes_file"
+        #echo end of board sizes_file json
+        echo "}," >> "$sizes_file"
     fi
-    #echo end of sketches sizes_file json
-    echo "]" >> "$sizes_file"
-    #echo end of board sizes_file json
-    echo "}," >> "$sizes_file"
 
     return 0
 }