Merge branch 'master' into skyslycer/midi-pitch-channel-fix

Author: me-no-dev

.github/scripts/get_affected.py

@@ -7,27 +7,33 @@ CHECK_REQUIREMENTS="./components/arduino-esp32/.github/scripts/sketch_utils.sh c
 # Export IDF environment
 . ${IDF_PATH}/export.sh
 
-# Find all examples in ./components/arduino-esp32/idf_component_examples
-idf_component_examples=$(find ./components/arduino-esp32/idf_component_examples -mindepth 1 -maxdepth 1 -type d)
-
-for example in $idf_component_examples; do
- if [ -f "$example"/ci.json ]; then
+if [ -n "$1" ]; then
+ # If a file is provided, use it to get the affected examples.
+ affected_examples=$(cat "$1" | sort)
+else
+ # Otherwise, find all examples in ./components/arduino-esp32/idf_component_examples
+ affected_examples=$(find ./components/arduino-esp32/idf_component_examples -mindepth 1 -maxdepth 1 -type d | sed 's|^\./components/arduino-esp32/||' | sort)
+fi
+
+for example in $affected_examples; do
+ example_path="$PWD/components/arduino-esp32/$example"
+ if [ -f "$example_path/ci.json" ]; then
  # If the target is listed as false, skip the sketch. Otherwise, include it.
- is_target=$(jq -r --arg target "$IDF_TARGET" '.targets[$target]' "$example"/ci.json)
+ is_target=$(jq -r --arg target "$IDF_TARGET" '.targets[$target]' "$example_path/ci.json")
  if [[ "$is_target" == "false" ]]; then
  printf "\n\033[93mSkipping %s for target %s\033[0m\n\n" "$example" "$IDF_TARGET"
  continue
  fi
  fi
 
- idf.py -C "$example" set-target "$IDF_TARGET"
+ idf.py -C "$example_path" set-target "$IDF_TARGET"
 
- has_requirements=$(${CHECK_REQUIREMENTS} "$example" "$example/sdkconfig")
+ has_requirements=$(${CHECK_REQUIREMENTS} "$example_path" "$example_path/sdkconfig")
  if [ "$has_requirements" -eq 0 ]; then
  printf "\n\033[93m%s does not meet the requirements for %s. Skipping...\033[0m\n\n" "$example" "$IDF_TARGET"
  continue
  fi
 
  printf "\n\033[95mBuilding %s\033[0m\n\n" "$example"
- idf.py -C "$example" -DEXTRA_COMPONENT_DIRS="$PWD/components" build
+ idf.py -C "$example_path" -DEXTRA_COMPONENT_DIRS="$PWD/components" build
 done

.github/scripts/on-push-idf.sh

@@ -357,7 +357,7 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
  unset options
 }
 
-function count_sketches { # count_sketches <path> [target] [file] [ignore-requirements]
+function count_sketches { # count_sketches <path> [target] [ignore-requirements] [file]
  local path=$1
  local target=$2
  local ignore_requirements=$3
@@ -376,7 +376,7 @@ function count_sketches { # count_sketches <path> [target] [file] [ignore-requir
  fi
 
  if [ -f "$file" ]; then
- sketches=$(cat "$file")
+ sketches=$(cat "$file" | sort)
  else
  sketches=$(find "$path" -name '*.ino' | sort)
  fi

.github/scripts/set_push_chunks.sh

@@ -23,8 +23,6 @@ on:
  - "libraries/**/*.cpp"
  - "libraries/**/*.c"
  - "libraries/**/*.h"
- - "libraries/**/*.ino"
- - "libraries/**/ci.json"
  - "idf_component_examples/**"
  - "idf_component.yml"
  - "Kconfig.projbuild"
@@ -33,9 +31,11 @@ on:
  - ".github/scripts/check-cmakelists.sh"
  - ".github/scripts/on-push-idf.sh"
  - ".github/scripts/sketch_utils.sh"
+ - ".github/scripts/get_affected.py"
  - "variants/esp32/**"
  - "variants/esp32c2/**"
  - "variants/esp32c3/**"
+ - "variants/esp32c5/**"
  - "variants/esp32c6/**"
  - "variants/esp32h2/**"
  - "variants/esp32p4/**"
@@ -68,7 +68,51 @@ jobs:
  outputs:
  idf_ver: ${{ steps.set-matrix.outputs.idf_ver }}
  idf_target: ${{ steps.set-matrix.outputs.idf_target }}
+ should_build: ${{ steps.affected-examples.outputs.should_build }}
  steps:
+ - name: Install universal-ctags
+ uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # v1.5.3
+ with:
+ packages: libicu74 libjansson4 libxml2 libyaml-0-2 universal-ctags
+ version: 1
+ execute_install_scripts: true
+
+ - name: Checkout repository
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+ with:
+ fetch-depth: 2
+
+ - name: Get changed files
+ id: changed-files
+ uses: tj-actions/changed-files@2f7c5bfce28377bc069a65ba478de0a74aa0ca32 # v46.0.1
+
+ - name: Get affected examples
+ id: affected-examples
+ env:
+ IS_PR: ${{ github.event_name == 'pull_request' }}
+ run: |
+ (which ctags-universal || which ctags) || (echo "Error: Neither ctags-universal nor ctags found in PATH" && exit 1)
+ python3 ./.github/scripts/get_affected.py --debug --component ${{ steps.changed-files.outputs.all_changed_files }} > affected_examples.txt
+
+ - name: Upload affected examples
+ uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+ with:
+ name: affected_examples
+ path: affected_examples.txt
+ if-no-files-found: error
+
+ - name: Upload debug artifacts
+ uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+ with:
+ name: get_affected_debug
+ path: |
+ ctags_defs_by_qname.json
+ ctags_header_to_qnames.json
+ ctags_tags.jsonl
+ dependencies.json
+ dependencies_reverse.json
+ if-no-files-found: warn
+
  - name: Get IDF Version and Targets
  id: set-matrix
  run: |
@@ -100,6 +144,7 @@ jobs:
  name: Build IDF ${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
  runs-on: ubuntu-latest
  needs: set-matrix
+ if: ${{ needs.set-matrix.outputs.should_build == '1' }}
  strategy:
  fail-fast: false
  matrix:
@@ -121,13 +166,18 @@ jobs:
  - name: Setup jq
  uses: dcarbone/install-jq-action@e397bd87438d72198f81efd21f876461183d383a # v3.0.1
 
+ - name: Download affected examples
+ uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+ with:
+ name: affected_examples
+
  - name: Build
  env:
  IDF_TARGET: ${{ matrix.idf_target }}
  shell: bash
  run: |
  chmod a+x ./components/arduino-esp32/.github/scripts/*
- ./components/arduino-esp32/.github/scripts/on-push-idf.sh
+ ./components/arduino-esp32/.github/scripts/on-push-idf.sh affected_examples.txt
 
  - name: Upload generated sdkconfig files for debugging
  uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

.github/scripts/sketch_utils.sh

@@ -13,8 +13,8 @@ concurrency:
  cancel-in-progress: true
 
 permissions:
- contents: write
- pull-requests: read
+ contents: read
+ pull-requests: write
 
 jobs:
  lint:
@@ -34,6 +34,7 @@ jobs:
  - name: Remove Label
  if: contains(github.event.pull_request.labels.*.name, 'Re-trigger Pre-commit Hooks')
  run: gh pr edit ${{ github.event.number }} --remove-label 'Re-trigger Pre-commit Hooks'
+ continue-on-error: true
  env:
  GH_TOKEN: ${{ github.token }}
 
@@ -65,6 +66,7 @@ jobs:
  uses: tj-actions/changed-files@2f7c5bfce28377bc069a65ba478de0a74aa0ca32 # v46.0.1
 
  - name: Run pre-commit hooks in changed files
+ id: pre-commit
  run: pre-commit run --color=always --show-diff-on-failure --files ${{ steps.changed-files.outputs.all_changed_files }}
 
  - name: Save pre-commit cache
@@ -82,3 +84,20 @@ jobs:
  if: ${{ always() && github.event_name == 'pull_request' }}
  with:
  msg: "ci(pre-commit): Apply automatic fixes"
+
+ - name: Add label if no commits are pending
+ if: ${{ failure() && steps.pre-commit.outcome == 'failure' && steps.pre-commit.outputs.pending_commit == '0' && github.event_name == 'pull_request' }}
+ continue-on-error: true
+ run: |
+ gh pr edit ${{ github.event.number }} --add-label 'Status: Pre-commit fixes required ⚠️'
+ env:
+ GH_TOKEN: ${{ github.token }}
+
+ - name: Remove label if everything was fixed
+ if: ${{ success() && github.event_name == 'pull_request' }}
+ continue-on-error: true
+ run: |
+ gh pr edit ${{ github.event.number }} --remove-label 'Status: Pre-commit fixes required ⚠️'
+ env:
+ GH_TOKEN: ${{ github.token }}
+