Skip to content

Commit 2d3ec1c

Browse files
authored
Merge branch 'espressif:master' into master
2 parents a2a313a + 0fa4aa6 commit 2d3ec1c

File tree

91 files changed

+1851
-283
lines changed

Some content is hidden

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

91 files changed

+1851
-283
lines changed

.github/ISSUE_TEMPLATE/Issue-report.yml

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ body:
4141
options:
4242
- latest master (checkout manually)
4343
- latest development Release Candidate (RC-X)
44+
- v3.0.3
45+
- v3.0.2
4446
- v3.0.1
4547
- v3.0.0
4648
- v2.0.17

.github/scripts/on-release.sh

+3
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ else
192192
cp -Rf "$GITHUB_WORKSPACE/variants/${variant}" "$PKG_DIR/variants/"
193193
done
194194
fi
195+
cp -f "$GITHUB_WORKSPACE/CMakeLists.txt" "$PKG_DIR/"
196+
cp -f "$GITHUB_WORKSPACE/idf_component.yml" "$PKG_DIR/"
197+
cp -f "$GITHUB_WORKSPACE/Kconfig.projbuild" "$PKG_DIR/"
195198
cp -f "$GITHUB_WORKSPACE/package.json" "$PKG_DIR/"
196199
cp -f "$GITHUB_WORKSPACE/programmers.txt" "$PKG_DIR/"
197200
cp -Rf "$GITHUB_WORKSPACE/cores" "$PKG_DIR/"

.github/scripts/update-version.sh

+7
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,11 @@ sed "s/#define ESP_ARDUINO_VERSION_MAJOR.*/#define ESP_ARDUINO_VERSION_MAJOR $ES
3636
sed "s/#define ESP_ARDUINO_VERSION_MINOR.*/#define ESP_ARDUINO_VERSION_MINOR $ESP_ARDUINO_VERSION_MINOR/g" | \
3737
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
3838

39+
for lib in `ls libraries`; do
40+
if [ -f "libraries/$lib/library.properties" ]; then
41+
echo "Updating Library $lib..."
42+
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"
43+
fi
44+
done
45+
3946
exit 0

.github/workflows/tests_results.yml

+39-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ jobs:
2222
statuses: write
2323
checks: write
2424
pull-requests: write
25+
contents: write
2526
steps:
27+
- uses: actions/checkout@v4
28+
with:
29+
ref: gh-pages
30+
2631
- name: Download and Extract Artifacts
2732
uses: dawidd6/action-download-artifact@v6
2833
with:
@@ -35,15 +40,18 @@ jobs:
3540
original_action=$(cat ./artifacts/parent-artifacts/action.txt)
3641
original_sha=$(cat ./artifacts/parent-artifacts/sha.txt)
3742
original_ref=$(cat ./artifacts/parent-artifacts/ref.txt)
43+
original_conclusion=$(cat ./artifacts/parent-artifacts/conclusion.txt)
3844
echo "original_event=$original_event" >> $GITHUB_ENV
3945
echo "original_action=$original_action" >> $GITHUB_ENV
4046
echo "original_sha=$original_sha" >> $GITHUB_ENV
4147
echo "original_ref=$original_ref" >> $GITHUB_ENV
48+
echo "original_conclusion=$original_conclusion" >> $GITHUB_ENV
4249
4350
echo "original_event = $original_event"
4451
echo "original_action = $original_action"
4552
echo "original_sha = $original_sha"
4653
echo "original_ref = $original_ref"
54+
echo "original_conclusion = $original_conclusion"
4755
4856
- name: Publish Unit Test Results
4957
uses: EnricoMi/publish-unit-test-result-action@v2
@@ -54,6 +62,10 @@ jobs:
5462
files: ./artifacts/**/*.xml
5563
action_fail: true
5664

65+
- name: Fail if tests failed
66+
if: ${{ env.original_conclusion == 'failure' || env.original_conclusion == 'timed_out' || github.event.workflow_run.conclusion == 'failure' || github.event.workflow_run.conclusion == 'timed_out' }}
67+
run: exit 1
68+
5769
- name: Clean up caches
5870
if: always()
5971
uses: actions/github-script@v7
@@ -102,7 +114,33 @@ jobs:
102114
repo: repo,
103115
sha: sha,
104116
state: '${{ job.status }}',
105-
description: '${{ job.status }}' ? 'Runtime tests successful' : 'Runtime tests failed',
117+
description: '${{ job.status }}' == 'success' ? 'Runtime tests successful' : 'Runtime tests failed',
106118
target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
107119
})).data;
108120
core.info(`${name} is ${state}`);
121+
122+
- name: Create output folder
123+
if: ${{ !cancelled() && (env.original_event == 'schedule' || env.original_event == 'workflow_dispatch') }}
124+
run: |
125+
rm -rf artifacts
126+
mkdir -p runtime-tests-results
127+
128+
- name: Generate badge
129+
if: ${{ !cancelled() && (env.original_event == 'schedule' || env.original_event == 'workflow_dispatch') }}
130+
uses: jaywcjlove/[email protected]
131+
with:
132+
label: Runtime Tests
133+
status: ${{ job.status }}
134+
output: runtime-tests-results/badge.svg
135+
color: ${{ job.status == 'success' && 'green' || 'red' }}
136+
137+
- name: Push badge
138+
if: ${{ !cancelled() && (env.original_event == 'schedule' || env.original_event == 'workflow_dispatch') }}
139+
run: |
140+
git config user.name "github-actions[bot]"
141+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
142+
if [[ `git status --porcelain` ]]; then
143+
git add --all
144+
git commit -m "Updated runtime tests badge"
145+
git push origin HEAD:gh-pages
146+
fi

.github/workflows/tests_wokwi.yml

+5
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ jobs:
9292
exit 1
9393
fi
9494
95+
conclusion="${{ github.event.workflow_run.conclusion }}"
96+
printf "$conclusion" >> artifacts/conclusion.txt
97+
printf "\nConclusion = "
98+
cat artifacts/conclusion.txt
99+
95100
echo "pr_num=$pr_num" >> $GITHUB_OUTPUT
96101
echo "ref=$ref" >> $GITHUB_OUTPUT
97102

.pre-commit-config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ repos:
3434
hooks:
3535
- id: clang-format
3636
types_or: [c, c++]
37+
exclude: ^.*\/build_opt\.h$
3738
- repo: https://github.com/psf/black-pre-commit-mirror
3839
rev: "22.10.0"
3940
hooks:

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Arduino core for the ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6 and ESP32-H2
22

3-
![Build Status](https://github.com/espressif/arduino-esp32/workflows/ESP32%20Arduino%20CI/badge.svg) [![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/blob/gh-pages/LIBRARIES_TEST.md) [![Hardware Tests](https://github.com/espressif/arduino-esp32/actions/workflows/tests.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/actions/workflows/tests.yml?query=event%3Aschedule)
3+
![Build Status](https://github.com/espressif/arduino-esp32/workflows/ESP32%20Arduino%20CI/badge.svg) [![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/blob/gh-pages/LIBRARIES_TEST.md) [![Hardware Tests](https://github.com/espressif/arduino-esp32/blob/gh-pages/runtime-tests-results/badge.svg)](https://github.com/espressif/arduino-esp32/actions/workflows/tests_results.yml)
44

55
### Need help or have a question? Join the chat at [Gitter](https://gitter.im/espressif/arduino-esp32) or [open a new Discussion](https://github.com/espressif/arduino-esp32/discussions)
66

0 commit comments

Comments
 (0)