Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a8df9ec

Browse files
authoredSep 12, 2024
Merge branch 'espressif:master' into esp_matter_light_example
2 parents 293f066 + 4e9eb35 commit a8df9ec

File tree

78 files changed

+889
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+889
-185
lines changed
 

‎.github/scripts/sketch_utils.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,10 +416,17 @@ function build_sketches(){ # build_sketches <ide_path> <user_path> <target> <pat
416416
echo "Start Sketch: $start_num"
417417
echo "End Sketch : $end_index"
418418

419+
#if fqbn is not passed then set it to default for compilation log
420+
if [ -z $fqbn ]; then
421+
log_fqbn="espressif:esp32:$target"
422+
else
423+
log_fqbn=$fqbn
424+
fi
425+
419426
sizes_file="$GITHUB_WORKSPACE/cli_compile_$chunk_index.json"
420427
if [ $log_compilation ]; then
421428
#echo board,target and start of sketches to sizes_file json
422-
echo "{ \"board\": \"$fqbn\",
429+
echo "{ \"board\": \"$log_fqbn\",
423430
\"target\": \"$target\",
424431
\"sketches\": [" >> "$sizes_file"
425432
fi

‎.pre-commit-config.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ repos:
2525
args: [--fix=lf]
2626
- id: trailing-whitespace
2727
args: [--markdown-linebreak-ext=md]
28+
- id: pretty-format-json
29+
args: [--autofix]
30+
types_or: [json]
31+
exclude: |
32+
(?x)(
33+
diagram\..*\.json$|
34+
package\.json$|
35+
^package\/.*$
36+
)
2837
- repo: https://github.com/codespell-project/codespell
2938
rev: "v2.3.0"
3039
hooks:

0 commit comments

Comments
 (0)