Skip to content

Commit 21d9042

Browse files
authored
Merge branch 'espressif:master' into master
2 parents fe36df8 + 5ecda3a commit 21d9042

File tree

119 files changed

+2584
-261
lines changed

Some content is hidden

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

119 files changed

+2584
-261
lines changed

Diff for: .github/scripts/tests_run.sh

+4
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ while [ ! -z "$1" ]; do
132132
-W )
133133
shift
134134
wokwi_timeout=$1
135+
if [[ -z $WOKWI_CLI_TOKEN ]]; then
136+
echo "Wokwi CLI token is not set"
137+
exit 1
138+
fi
135139
platform="wokwi"
136140
;;
137141
-o )

Diff for: .github/workflows/docs_build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- master
7-
- release/*
7+
- release/v2.x
88
paths:
99
- 'docs/**'
1010
- '.github/workflows/docs_build.yml'

Diff for: .github/workflows/docs_deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [published]
66
push:
77
branches:
8-
- release/*
8+
- release/v2.x
99
- master
1010
paths:
1111
- 'docs/**'

Diff for: .github/workflows/push.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches:
77
- master
8-
- release/*
8+
- release/v2.x
99
pull_request:
1010
paths:
1111
- 'cores/**'

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tools/esp32-arduino-libs
2+
tools/xtensa-esp-elf
23
tools/xtensa-esp32-elf
34
tools/xtensa-esp32s2-elf
45
tools/xtensa-esp32s3-elf

0 commit comments

Comments
 (0)