Merge remote-tracking branch 'upstream/master' into feature/zigbee-library

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

.github/ISSUE_TEMPLATE/Issue-report.yml

@@ -41,6 +41,9 @@ body:
       options:
         - latest master (checkout manually)
         - latest development Release Candidate (RC-X)
+        - v3.0.4
+        - v3.0.3
+        - v3.0.2
         - v3.0.1
         - v3.0.0
         - v2.0.17

.github/scripts/install-arduino-cli.sh

@@ -41,6 +41,12 @@ fi
 if [ ! -d "$ARDUINO_IDE_PATH" ] || [ ! -f "$ARDUINO_IDE_PATH/arduino-cli" ]; then
     echo "Installing Arduino CLI on $OS_NAME ..."
     mkdir -p "$ARDUINO_IDE_PATH"
-    curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$ARDUINO_IDE_PATH" sh
+    if [ "$OS_IS_WINDOWS" == "1" ]; then
+        curl -fsSL https://downloads.arduino.cc/arduino-cli/arduino-cli_latest_Windows_64bit.zip -o arduino-cli.zip
+        unzip -q arduino-cli.zip -d "$ARDUINO_IDE_PATH"
+        rm arduino-cli.zip
+    else
+        curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$ARDUINO_IDE_PATH" sh
+    fi
 fi
 

.github/scripts/on-release.sh

@@ -192,6 +192,9 @@ else
         cp -Rf "$GITHUB_WORKSPACE/variants/${variant}"      "$PKG_DIR/variants/"
     done
 fi
+cp -f  "$GITHUB_WORKSPACE/CMakeLists.txt"                   "$PKG_DIR/"
+cp -f  "$GITHUB_WORKSPACE/idf_component.yml"                "$PKG_DIR/"
+cp -f  "$GITHUB_WORKSPACE/Kconfig.projbuild"                "$PKG_DIR/"
 cp -f  "$GITHUB_WORKSPACE/package.json"                     "$PKG_DIR/"
 cp -f  "$GITHUB_WORKSPACE/programmers.txt"                  "$PKG_DIR/"
 cp -Rf "$GITHUB_WORKSPACE/cores"                            "$PKG_DIR/"
@@ -418,7 +421,54 @@ if [ "$RELEASE_PRE" == "false" ]; then
     fi
 fi
 
-# Upload package JSONs (temporary halted to fix json generation)
+# Test the package JSONs
+
+echo "Installing arduino-cli ..."
+export PATH="/home/runner/bin:$PATH"
+source ./.github/scripts/install-arduino-cli.sh
+
+echo "Testing $PACKAGE_JSON_DEV install ..."
+echo "Updating index ..."
+arduino-cli core update-index --additional-urls "file://$OUTPUT_DIR/$PACKAGE_JSON_DEV"
+if [ $? -ne 0 ]; then echo "ERROR: Failed to update index ($?)"; exit 1; fi
+
+echo "Installing esp32 ..."
+arduino-cli core install esp32:esp32
+if [ $? -ne 0 ]; then echo "ERROR: Failed to install esp32 ($?)"; exit 1; fi
+
+echo "Compiling example ..."
+arduino-cli compile --fqbn esp32:esp32:esp32 $GITHUB_WORKSPACE/libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino
+if [ $? -ne 0 ]; then echo "ERROR: Failed to compile example ($?)"; exit 1; fi
+
+echo "Uninstalling esp32 ..."
+arduino-cli core uninstall esp32:esp32
+if [ $? -ne 0 ]; then echo "ERROR: Failed to uninstall esp32 ($?)"; exit 1; fi
+
+echo "Test successful!"
+
+if [ "$RELEASE_PRE" == "false" ]; then
+    echo "Testing $PACKAGE_JSON_REL install ..."
+    echo "Updating index ..."
+    arduino-cli core update-index --additional-urls "file://$OUTPUT_DIR/$PACKAGE_JSON_REL"
+    if [ $? -ne 0 ]; then echo "ERROR: Failed to update index ($?)"; exit 1; fi
+
+    echo "Installing esp32 ..."
+    arduino-cli core install esp32:esp32
+    if [ $? -ne 0 ]; then echo "ERROR: Failed to install esp32 ($?)"; exit 1; fi
+
+    echo "Compiling example ..."
+    arduino-cli compile --fqbn esp32:esp32:esp32 $GITHUB_WORKSPACE/libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino
+    if [ $? -ne 0 ]; then echo "ERROR: Failed to compile example ($?)"; exit 1; fi
+
+    echo "Uninstalling esp32 ..."
+    arduino-cli core uninstall esp32:esp32
+    if [ $? -ne 0 ]; then echo "ERROR: Failed to uninstall esp32 ($?)"; exit 1; fi
+
+    echo "Test successful!"
+fi
+
+# Upload package JSONs
+
 echo "Uploading $PACKAGE_JSON_DEV ..."
 echo "Download URL: "`git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`
 echo "Pages URL: "`git_safe_upload_to_pages "$PACKAGE_JSON_DEV" "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`

.github/scripts/tests_run.sh

@@ -69,6 +69,10 @@ function run_test() {
             if [[ -f "$sketchdir/scenario.yaml" ]]; then
                 extra_args+=" --wokwi-scenario $sketchdir/scenario.yaml"
             fi
+            if [[ -f "$sketchdir/diagram.$target.json" ]]; then
+                extra_args+=" --wokwi-diagram $sketchdir/diagram.$target.json"
+            fi
+
         elif [ $platform == "qemu" ]; then
             PATH=$HOME/qemu/bin:$PATH
             extra_args="--embedded-services qemu --qemu-image-path $build_dir/$sketchname.ino.merged.bin"

.github/scripts/update-version.sh

@@ -36,4 +36,11 @@ sed "s/#define ESP_ARDUINO_VERSION_MAJOR.*/#define ESP_ARDUINO_VERSION_MAJOR $ES
 sed "s/#define ESP_ARDUINO_VERSION_MINOR.*/#define ESP_ARDUINO_VERSION_MINOR $ESP_ARDUINO_VERSION_MINOR/g" | \
 sed "s/#define ESP_ARDUINO_VERSION_PATCH.*/#define ESP_ARDUINO_VERSION_PATCH $ESP_ARDUINO_VERSION_PATCH/g" > __esp_arduino_version.h && mv __esp_arduino_version.h cores/esp32/esp_arduino_version.h
 
+for lib in `ls libraries`; do
+	if [ -f "libraries/$lib/library.properties" ]; then
+		echo "Updating Library $lib..."
+		cat "libraries/$lib/library.properties" | sed "s/version=.*/version=$ESP_ARDUINO_VERSION/g" > "libraries/$lib/__library.properties" && mv "libraries/$lib/__library.properties" "libraries/$lib/library.properties"
+	fi
+done
+
 exit 0

.github/workflows/release.yml

@@ -17,6 +17,7 @@ jobs:
       with:
         python-version: '3.x'
     - run: pip install packaging
+    - run: pip install pyserial
     - name: Build Release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests_hw.yml

@@ -12,6 +12,13 @@ on:
         description: 'Chip to run tests for'
         required: true
 
+env:
+  DEBIAN_FRONTEND: noninteractive
+
+defaults:
+  run:
+    shell: bash
+
 jobs:
   hardware-test:
     name: Hardware ${{ inputs.chip }} ${{ inputs.type }} tests
@@ -48,6 +55,13 @@ jobs:
       - name: Checkout user repository
         if: ${{ steps.check-tests.outputs.enabled == 'true' }}
         uses: actions/checkout@v4
+        with:
+          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

.github/workflows/tests_results.yml

@@ -22,7 +22,12 @@ jobs:
         statuses: write
         checks: write
         pull-requests: write
+        contents: write
     steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: gh-pages
+
       - name: Download and Extract Artifacts
         uses: dawidd6/action-download-artifact@v6
         with:
@@ -35,15 +40,18 @@ jobs:
           original_action=$(cat ./artifacts/parent-artifacts/action.txt)
           original_sha=$(cat ./artifacts/parent-artifacts/sha.txt)
           original_ref=$(cat ./artifacts/parent-artifacts/ref.txt)
+          original_conclusion=$(cat ./artifacts/parent-artifacts/conclusion.txt)
           echo "original_event=$original_event" >> $GITHUB_ENV
           echo "original_action=$original_action" >> $GITHUB_ENV
           echo "original_sha=$original_sha" >> $GITHUB_ENV
           echo "original_ref=$original_ref" >> $GITHUB_ENV
+          echo "original_conclusion=$original_conclusion" >> $GITHUB_ENV
 
           echo "original_event = $original_event"
           echo "original_action = $original_action"
           echo "original_sha = $original_sha"
           echo "original_ref = $original_ref"
+          echo "original_conclusion = $original_conclusion"
 
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
@@ -54,6 +62,10 @@ jobs:
           files: ./artifacts/**/*.xml
           action_fail: true
 
+      - name: Fail if tests failed
+        if: ${{ env.original_conclusion == 'failure' || env.original_conclusion == 'timed_out' || github.event.workflow_run.conclusion == 'failure' || github.event.workflow_run.conclusion == 'timed_out' }}
+        run: exit 1
+
       - name: Clean up caches
         if: always()
         uses: actions/github-script@v7
@@ -102,7 +114,33 @@ jobs:
               repo: repo,
               sha: sha,
               state: '${{ job.status }}',
-              description: '${{ job.status }}' ? 'Runtime tests successful' : 'Runtime tests failed',
+              description: '${{ job.status }}' == 'success' ? 'Runtime tests successful' : 'Runtime tests failed',
               target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
             })).data;
             core.info(`${name} is ${state}`);
+
+      - name: Create output folder
+        if: ${{ !cancelled() && (env.original_event == 'schedule' || env.original_event == 'workflow_dispatch') }}
+        run: |
+          rm -rf artifacts
+          mkdir -p runtime-tests-results
+
+      - name: Generate badge
+        if: ${{ !cancelled() && (env.original_event == 'schedule' || env.original_event == 'workflow_dispatch') }}
+        uses: jaywcjlove/generated-badges@v1.0.13
+        with:
+          label: Runtime Tests
+          status: ${{ job.status }}
+          output: runtime-tests-results/badge.svg
+          color: ${{ job.status == 'success' && 'green' || 'red' }}
+
+      - name: Push badge
+        if: ${{ !cancelled() && (env.original_event == 'schedule' || env.original_event == 'workflow_dispatch') }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          if [[ `git status --porcelain` ]]; then
+            git add --all
+            git commit -m "Updated runtime tests badge"
+            git push origin HEAD:gh-pages
+          fi

.github/workflows/tests_wokwi.yml

@@ -92,6 +92,11 @@ jobs:
             exit 1
           fi
 
+          conclusion="${{ github.event.workflow_run.conclusion }}"
+          printf "$conclusion" >> artifacts/conclusion.txt
+          printf "\nConclusion = "
+          cat artifacts/conclusion.txt
+
           echo "pr_num=$pr_num" >> $GITHUB_OUTPUT
           echo "ref=$ref" >> $GITHUB_OUTPUT
 

.pre-commit-config.yaml

@@ -34,6 +34,7 @@ repos:
     hooks:
       - id: clang-format
         types_or: [c, c++]
+        exclude: ^.*\/build_opt\.h$
   - repo: https://github.com/psf/black-pre-commit-mirror
     rev: "22.10.0"
     hooks: