Skip to content

Commit c3d7eb2

Browse files
authored
Merge branch 'master' into master
2 parents 1c46df6 + dd86244 commit c3d7eb2

Some content is hidden

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

53 files changed

+1723
-309
lines changed

Diff for: .github/scripts/install-arduino-cli.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ fi
4141
if [ ! -d "$ARDUINO_IDE_PATH" ] || [ ! -f "$ARDUINO_IDE_PATH/arduino-cli" ]; then
4242
echo "Installing Arduino CLI on $OS_NAME ..."
4343
mkdir -p "$ARDUINO_IDE_PATH"
44-
curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$ARDUINO_IDE_PATH" sh
44+
if [ "$OS_IS_WINDOWS" == "1" ]; then
45+
curl -fsSL https://downloads.arduino.cc/arduino-cli/arduino-cli_latest_Windows_64bit.zip -o arduino-cli.zip
46+
unzip -q arduino-cli.zip -d "$ARDUINO_IDE_PATH"
47+
rm arduino-cli.zip
48+
else
49+
curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$ARDUINO_IDE_PATH" sh
50+
fi
4551
fi
4652

Diff for: .github/scripts/on-release.sh

+47-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,53 @@ if [ "$RELEASE_PRE" == "false" ]; then
421421
fi
422422
fi
423423

424-
# Upload package JSONs (temporary halted to fix json generation)
424+
# Test the package JSONs
425+
426+
echo "Installing arduino-cli ..."
427+
source ./.github/scripts/install-arduino-cli.sh
428+
429+
echo "Testing $PACKAGE_JSON_DEV install ..."
430+
echo "Updating index ..."
431+
arduino-cli core update-index --additional-urls "file://$OUTPUT_DIR/$PACKAGE_JSON_DEV"
432+
if [ $? -ne 0 ]; then echo "ERROR: Failed to update index ($?)"; exit 1; fi
433+
434+
echo "Installing esp32 ..."
435+
arduino-cli core install esp32:esp32
436+
if [ $? -ne 0 ]; then echo "ERROR: Failed to install esp32 ($?)"; exit 1; fi
437+
438+
echo "Compiling example ..."
439+
arduino-cli compile --fqbn espressif:esp32:esp32 $GITHUB_WORKSPACE/libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino
440+
if [ $? -ne 0 ]; then echo "ERROR: Failed to compile example ($?)"; exit 1; fi
441+
442+
echo "Uninstalling esp32 ..."
443+
arduino-cli core uninstall esp32:esp32
444+
if [ $? -ne 0 ]; then echo "ERROR: Failed to uninstall esp32 ($?)"; exit 1; fi
445+
446+
echo "Test successful!"
447+
448+
if [ "$RELEASE_PRE" == "false" ]; then
449+
echo "Testing $PACKAGE_JSON_REL install ..."
450+
echo "Updating index ..."
451+
arduino-cli core update-index --additional-urls "file://$OUTPUT_DIR/$PACKAGE_JSON_REL"
452+
if [ $? -ne 0 ]; then echo "ERROR: Failed to update index ($?)"; exit 1; fi
453+
454+
echo "Installing esp32 ..."
455+
arduino-cli core install esp32:esp32
456+
if [ $? -ne 0 ]; then echo "ERROR: Failed to install esp32 ($?)"; exit 1; fi
457+
458+
echo "Compiling example ..."
459+
arduino-cli compile --fqbn espressif:esp32:esp32 $GITHUB_WORKSPACE/libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino
460+
if [ $? -ne 0 ]; then echo "ERROR: Failed to compile example ($?)"; exit 1; fi
461+
462+
echo "Uninstalling esp32 ..."
463+
arduino-cli core uninstall esp32:esp32
464+
if [ $? -ne 0 ]; then echo "ERROR: Failed to uninstall esp32 ($?)"; exit 1; fi
465+
466+
echo "Test successful!"
467+
fi
468+
469+
# Upload package JSONs
470+
425471
echo "Uploading $PACKAGE_JSON_DEV ..."
426472
echo "Download URL: "`git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`
427473
echo "Pages URL: "`git_safe_upload_to_pages "$PACKAGE_JSON_DEV" "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`

Diff for: .github/scripts/tests_run.sh

+4
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ function run_test() {
6969
if [[ -f "$sketchdir/scenario.yaml" ]]; then
7070
extra_args+=" --wokwi-scenario $sketchdir/scenario.yaml"
7171
fi
72+
if [[ -f "$sketchdir/diagram.$target.json" ]]; then
73+
extra_args+=" --wokwi-diagram $sketchdir/diagram.$target.json"
74+
fi
75+
7276
elif [ $platform == "qemu" ]; then
7377
PATH=$HOME/qemu/bin:$PATH
7478
extra_args="--embedded-services qemu --qemu-image-path $build_dir/$sketchname.ino.merged.bin"

Diff for: .github/workflows/tests_hw.yml

+14
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ on:
1212
description: 'Chip to run tests for'
1313
required: true
1414

15+
env:
16+
DEBIAN_FRONTEND: noninteractive
17+
18+
defaults:
19+
run:
20+
shell: bash
21+
1522
jobs:
1623
hardware-test:
1724
name: Hardware ${{ inputs.chip }} ${{ inputs.type }} tests
@@ -48,6 +55,13 @@ jobs:
4855
- name: Checkout user repository
4956
if: ${{ steps.check-tests.outputs.enabled == 'true' }}
5057
uses: actions/checkout@v4
58+
with:
59+
sparse-checkout: |
60+
*
61+
62+
- name: List files
63+
if: ${{ steps.check-tests.outputs.enabled == 'true' }}
64+
run: ls -la
5165

5266
# setup-python currently only works on ubuntu images
5367
# - uses: actions/setup-python@v5

Diff for: 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/blob/gh-pages/runtime-tests-results/badge.svg)](https://github.com/espressif/arduino-esp32/actions/workflows/tests_results.yml)
3+
[![Build Status](https://github.com/espressif/arduino-esp32/actions/workflows/push.yml/badge.svg?branch=master&event=push)](https://github.com/espressif/arduino-esp32/actions/workflows/push.yml) [![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)