Merge branch 'master' into release/v3.1.x

Author: me-no-dev

Diff for: .github/scripts/on-push.sh

@@ -6,20 +6,19 @@ export ARDUINO_BUILD_DIR="$HOME/.arduino/build.tmp"
 
 function build(){
     local target=$1
-    local fqbn=$2
-    local chunk_index=$3
-    local chunks_cnt=$4
-    local build_log=$5
-    local sketches_file=$6
-    shift; shift; shift; shift; shift; shift;
+    local chunk_index=$2
+    local chunks_cnt=$3
+    local build_log=$4
+    local sketches_file=$5
+    shift; shift; shift; shift; shift;
     local sketches=$*
 
     local BUILD_SKETCH="${SCRIPTS_DIR}/sketch_utils.sh build"
     local BUILD_SKETCHES="${SCRIPTS_DIR}/sketch_utils.sh chunk_build"
 
     local args="-ai $ARDUINO_IDE_PATH -au $ARDUINO_USR_PATH"
 
-    args+=" -t $target -fqbn $fqbn"
+    args+=" -t $target"
 
     if [ "$OS_IS_LINUX" == "1" ]; then
         args+=" -p $ARDUINO_ESP32_PATH/libraries"
@@ -77,13 +76,6 @@ if [ "$BUILD_PIO" -eq 0 ]; then
     source ${SCRIPTS_DIR}/install-arduino-cli.sh
     source ${SCRIPTS_DIR}/install-arduino-core-esp32.sh
 
-    FQBN_ESP32="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app"
-    FQBN_ESP32S2="espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app"
-    FQBN_ESP32S3="espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app"
-    FQBN_ESP32C3="espressif:esp32:esp32c3:PartitionScheme=huge_app"
-    FQBN_ESP32C6="espressif:esp32:esp32c6:PartitionScheme=huge_app"
-    FQBN_ESP32H2="espressif:esp32:esp32h2:PartitionScheme=huge_app"
-
     SKETCHES_ESP32="\
       $ARDUINO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino\
       $ARDUINO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino\
@@ -99,12 +91,12 @@ if [ "$BUILD_PIO" -eq 0 ]; then
     fi
 
     #build sketches for different targets
-    build "esp32s3" $FQBN_ESP32S3 "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
-    build "esp32s2" $FQBN_ESP32S2 "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
-    build "esp32c3" $FQBN_ESP32C3 "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
-    build "esp32c6" $FQBN_ESP32C6 "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
-    build "esp32h2" $FQBN_ESP32H2 "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
-    build "esp32"   $FQBN_ESP32   "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
+    build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
+    build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
+    build "esp32c3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
+    build "esp32c6" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
+    build "esp32h2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
+    build "esp32"   "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
 
     if [ "$BUILD_LOG" -eq 1 ]; then
         #remove last comma from the last JSON object

Diff for: .github/scripts/sketch_utils.sh

@@ -416,10 +416,17 @@ function build_sketches(){ # build_sketches <ide_path> <user_path> <target> <pat
     echo "Start Sketch: $start_num"
     echo "End Sketch  : $end_index"
 
+    #if fqbn is not passed then set it to default for compilation log
+    if [ -z $fqbn ]; then
+        log_fqbn="espressif:esp32:$target"
+    else
+        log_fqbn=$fqbn
+    fi
+
     sizes_file="$GITHUB_WORKSPACE/cli_compile_$chunk_index.json"
     if [ $log_compilation ]; then
         #echo board,target and start of sketches to sizes_file json
-        echo "{ \"board\": \"$fqbn\",
+        echo "{ \"board\": \"$log_fqbn\",
                 \"target\": \"$target\",
                 \"sketches\": [" >> "$sizes_file"
     fi

Diff for: .github/workflows/docs_deploy.yml

@@ -1,8 +1,10 @@
 name: Documentation Build and Production Deploy CI
 
 on:
-  release:
-    types: [published]
+  workflow_run:
+    workflows: ["ESP32 Arduino Release"]
+    types:
+      - completed
   push:
     branches:
     - release/v2.x
@@ -12,14 +14,18 @@ on:
     - '.github/workflows/docs_deploy.yml'
 
 jobs:
-
   deploy-prod-docs:
     name: Deploy Documentation on Production
     runs-on: ubuntu-22.04
     defaults:
       run:
         shell: bash
     steps:
+    - name: Check if release workflow is successful
+      if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion != 'success' }}
+      run: |
+        echo "Release workflow failed. Exiting..."
+        exit 1
     - uses: actions/checkout@v4
       with:
         submodules: true

Diff for: .github/workflows/upload-idf-component.yml

@@ -1,12 +1,35 @@
 name: Push components to https://components.espressif.com
+
 on:
-  push:
-    tags:
-      - '*'
+  workflow_run:
+    workflows: ["ESP32 Arduino Release"]
+    types:
+      - completed
+
 jobs:
   upload_components:
     runs-on: ubuntu-latest
     steps:
+      - name: Get the release tag
+        run: |
+          if [ "${{ github.event.workflow_run.conclusion }}" != "success" ]; then
+            echo "Release workflow failed. Exiting..."
+            exit 1
+          fi
+
+          branch=${{ github.event.workflow_run.head_branch }}
+          if [[ $branch == refs/tags/* ]]; then
+            tag="${branch#refs/tags/}"
+          elif [[ $branch =~ ^[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
+            tag=$branch
+          else
+            echo "Tag not found in $branch. Exiting..."
+            exit 1
+          fi
+
+          echo "Tag: $tag"
+          echo "RELEASE_TAG=$tag" >> $GITHUB_ENV
+
       - uses: actions/checkout@v4
         with:
           submodules: "recursive"
@@ -15,6 +38,6 @@ jobs:
         uses: espressif/upload-components-ci-action@v1
         with:
           name: arduino-esp32
-          version: ${{ github.ref_name }}
+          version: ${{ env.RELEASE_TAG }}
           namespace: espressif
           api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}

Diff for: .pre-commit-config.yaml

@@ -25,6 +25,15 @@ repos:
         args: [--fix=lf]
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
+      - id: pretty-format-json
+        args: [--autofix]
+        types_or: [json]
+        exclude: |
+          (?x)(
+              diagram\..*\.json$|
+              package\.json$|
+              ^package\/.*$
+          )
   - repo: https://github.com/codespell-project/codespell
     rev: "v2.3.0"
     hooks: