changed json format and removed moving the file

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

.github/scripts/on-push.sh

@@ -77,21 +77,22 @@ if [ "$BUILD_PIO" -eq 0 ]; then
       $ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino\
       $ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino\
     "
+    #create sizes_file and echo start of JSON array with "boards" key
+    sizes_file="$GITHUB_WORKSPACE/cli_compile_$CHUNK_INDEX.json"
+    echo "{\"boards\": [" > $sizes_file
 
+    #build sketches for different targets
     build "esp32s3" $FQBN_ESP32S3 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
     build "esp32s2" $FQBN_ESP32S2 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
     build "esp32c3" $FQBN_ESP32C3 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
     build "esp32c6" $FQBN_ESP32C6 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
     build "esp32h2" $FQBN_ESP32H2 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
     build "esp32"   $FQBN_ESP32   $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
 
-    sizes_file="$HOME/.arduino/cli_compile_output.json"
-    #rename sizes_file="$HOME/.arduino/cli_compile_output.json" to sizes_file="GITHUB_WORKSPACE/cli_compile_output_${chunk_index}.json"
-    echo "Listings of $HOME/.arduino"
-    ls $HOME/.arduino
-    mv $sizes_file "$GITHUB_WORKSPACE/cli_compile_$CHUNK_INDEX.json"
-    echo "Listings of $GITHUB_WORKSPACE"
-    ls $GITHUB_WORKSPACE
+    #remove last comma from the last JSON object
+    sed -i '' -e '$ s/,$//' $sizes_file
+    #echo end of JSON array
+    echo "]}" >> $sizes_file
 
 else
     source ${SCRIPTS_DIR}/install-platformio-esp32.sh

.github/scripts/sketch_utils.sh

@@ -141,7 +141,12 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
     fi
 
     log_file="$HOME/.arduino/cli_compile_output.txt"
-    sizes_file="$HOME/.arduino/cli_compile_output.json"
+    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"
 
     mkdir -p "$ARDUINO_CACHE_DIR"
     for i in `seq 0 $(($len - 1))`
@@ -182,16 +187,28 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
             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 '(%)')
 
+            # Define the constant part
+            constant_path="$HOME/Arduino/hardware/espressif/esp32/libraries/"
+
+            # Extract the desired substring using awk
+            lib_sketch_name=$(echo "$sketch" | sed "s|$constant_part\([^/]*\)/.*|\1|")
+
+            # Print the extracted substring
+            echo "Extracted Path: $lib_sketch_name"
+
             #append json file where key is fqbn, sketch name, sizes -> extracted values
-            echo "{\"fqbn\": \"$fqbn\", 
-                   \"sketch\": \"$sketch\", 
+            echo "{\"name\": \"$lib_sketch_name\", 
                    \"sizes\": {
                         \"flash_bytes\": $flash_bytes, 
                         \"flash_percentage\": $flash_percentage, 
                         \"ram_bytes\": $ram_bytes, 
                         \"ram_percentage\": $ram_percentage
                         }
-                  }" >> "$sizes_file"
+                  }," >> "$sizes_file"
+            #if i is the last index of the loop, remove the last comma
+            if [ $i -eq $(($len - 1)) ]; then
+                sed -i '$ s/.$//' "$sizes_file"
+            fi
 
         elif [ -f "$ide_path/arduino-builder" ]; then
             echo "Building $sketchname with arduino-builder and FQBN=$currfqbn"
@@ -226,6 +243,12 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
             #     $xtra_opts "${sketchdir}/${sketchname}.ino"
         fi
     done
+    
+    #echo end of sketches sizes_file json
+    echo "]}" >> "$sizes_file"
+    #echo end of board sizes_file json
+    echo "}," >> "$sizes_file"
+
     unset fqbn
     unset xtra_opts
     unset options

.github/workflows/push.yml

@@ -50,7 +50,7 @@ jobs:
 
     #Upload cli compile json as artifact
     - name: Upload cli compile json
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: cli_compile_${{ matrix.chunk }}
         path: cli_compile_${{ matrix.chunk }}.json