Skip to content

Commit 857935c

Browse files
SuGliderSuGlider
committed
feat(support): toll and ci changes
1 parent 98da424 commit 857935c

File tree

8 files changed

+30
-507
lines changed

8 files changed

+30
-507
lines changed

Diff for: ‎.github/ISSUE_TEMPLATE/Issue-report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ body:
7575
attributes:
7676
label: IDE Name
7777
description: What IDE are you using?
78-
placeholder: eg. Arduino IDE, PlatformIO, Sloeber...
78+
placeholder: eg. Arduino IDE, VSCode, Sloeber...
7979
validations:
8080
required: true
8181
- type: input

Diff for: ‎.github/scripts/install-platformio-esp32.sh

-170
This file was deleted.

Diff for: ‎.github/scripts/on-push.sh

+29-52
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,11 @@ CHUNK_INDEX=$1
5454
CHUNKS_CNT=$2
5555
BUILD_LOG=$3
5656
SKETCHES_FILE=$4
57-
BUILD_PIO=0
5857
if [ "$#" -lt 2 ] || [ "$CHUNKS_CNT" -le 0 ]; then
5958
CHUNK_INDEX=0
6059
CHUNKS_CNT=1
6160
elif [ "$CHUNK_INDEX" -gt "$CHUNKS_CNT" ] && [ "$CHUNKS_CNT" -ge 2 ]; then
6261
CHUNK_INDEX=$CHUNKS_CNT
63-
elif [ "$CHUNK_INDEX" -eq "$CHUNKS_CNT" ]; then
64-
BUILD_PIO=1
6562
fi
6663

6764
if [ -z "$BUILD_LOG" ] || [ "$BUILD_LOG" -le 0 ]; then
@@ -72,54 +69,34 @@ fi
7269
#git -C "$GITHUB_WORKSPACE" submodule update --init --recursive > /dev/null 2>&1
7370

7471
SCRIPTS_DIR="./.github/scripts"
75-
if [ "$BUILD_PIO" -eq 0 ]; then
76-
source ${SCRIPTS_DIR}/install-arduino-cli.sh
77-
source ${SCRIPTS_DIR}/install-arduino-core-esp32.sh
78-
79-
SKETCHES_ESP32="\
80-
$ARDUINO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino\
81-
$ARDUINO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino\
82-
$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino\
83-
$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino\
84-
"
85-
#create sizes_file
86-
sizes_file="$GITHUB_WORKSPACE/cli_compile_$CHUNK_INDEX.json"
87-
88-
if [ "$BUILD_LOG" -eq 1 ]; then
89-
#create sizes_file and echo start of JSON array with "boards" key
90-
echo "{\"boards\": [" > $sizes_file
91-
fi
72+
source ${SCRIPTS_DIR}/install-arduino-cli.sh
73+
source ${SCRIPTS_DIR}/install-arduino-core-esp32.sh
74+
75+
SKETCHES_ESP32="\
76+
$ARDUINO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino\
77+
$ARDUINO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino\
78+
$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino\
79+
$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino\
80+
"
81+
#create sizes_file
82+
sizes_file="$GITHUB_WORKSPACE/cli_compile_$CHUNK_INDEX.json"
83+
84+
if [ "$BUILD_LOG" -eq 1 ]; then
85+
#create sizes_file and echo start of JSON array with "boards" key
86+
echo "{\"boards\": [" > $sizes_file
87+
fi
9288

93-
#build sketches for different targets
94-
build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
95-
build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
96-
build "esp32c3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
97-
build "esp32c6" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
98-
build "esp32h2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
99-
build "esp32" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
100-
101-
if [ "$BUILD_LOG" -eq 1 ]; then
102-
#remove last comma from the last JSON object
103-
sed -i '$ s/,$//' "$sizes_file"
104-
#echo end of JSON array
105-
echo "]}" >> $sizes_file
106-
fi
107-
else
108-
source ${SCRIPTS_DIR}/install-platformio-esp32.sh
109-
# PlatformIO ESP32 Test
110-
BOARD="esp32dev"
111-
OPTIONS="board_build.partitions = huge_app.csv"
112-
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
113-
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \
114-
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \
115-
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino" && \
116-
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
117-
118-
# Basic sanity testing for other series
119-
for board in "esp32-c3-devkitm-1" "esp32-s2-saola-1" "esp32-s3-devkitc-1"
120-
do
121-
python -m platformio ci --board "$board" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.partitions = huge_app.csv"
122-
done
123-
124-
#build_pio_sketches "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries"
89+
#build sketches for different targets
90+
build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
91+
build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
92+
build "esp32c3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
93+
build "esp32c6" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
94+
build "esp32h2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
95+
build "esp32" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
96+
97+
if [ "$BUILD_LOG" -eq 1 ]; then
98+
#remove last comma from the last JSON object
99+
sed -i '$ s/,$//' "$sizes_file"
100+
#echo end of JSON array
101+
echo "]}" >> $sizes_file
125102
fi

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

-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ cp -f "$GITHUB_WORKSPACE/tools/gen_insights_package.py" "$PKG_DIR/tools/"
207207
cp -f "$GITHUB_WORKSPACE/tools/gen_insights_package.exe" "$PKG_DIR/tools/"
208208
cp -Rf "$GITHUB_WORKSPACE/tools/partitions" "$PKG_DIR/tools/"
209209
cp -Rf "$GITHUB_WORKSPACE/tools/ide-debug" "$PKG_DIR/tools/"
210-
cp -f "$GITHUB_WORKSPACE/tools/platformio-build.py" "$PKG_DIR/tools/"
211210

212211
# Remove unnecessary files in the package folder
213212
echo "Cleaning up folders ..."

Diff for: ‎.github/scripts/set_push_chunks.sh

-1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,5 @@ echo "build_all=$build_all" >> $GITHUB_OUTPUT
7878
echo "build_libraries=$BUILD_LIBRARIES" >> $GITHUB_OUTPUT
7979
echo "build_static_sketches=$BUILD_STATIC_SKETCHES" >> $GITHUB_OUTPUT
8080
echo "build_idf=$BUILD_IDF" >> $GITHUB_OUTPUT
81-
echo "build_platformio=$BUILD_PLATFORMIO" >> $GITHUB_OUTPUT
8281
echo "chunk_count=$chunks_count" >> $GITHUB_OUTPUT
8382
echo "chunks=$chunks" >> $GITHUB_OUTPUT

Diff for: ‎.github/workflows/push.yml

-30
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161
build_libraries: ${{ steps.set-chunks.outputs.build_libraries }}
6262
build_static_sketches: ${{ steps.set-chunks.outputs.build_static_sketches }}
6363
build_idf: ${{ steps.set-chunks.outputs.build_idf }}
64-
build_platformio: ${{ steps.set-chunks.outputs.build_platformio }}
6564
chunk_count: ${{ steps.set-chunks.outputs.chunk_count }}
6665
chunks: ${{ steps.set-chunks.outputs.chunks }}
6766
steps:
@@ -77,11 +76,9 @@ jobs:
7776
files_yaml: |
7877
core:
7978
- '.github/**'
80-
- '!.github/scripts/install-platformio-esp32.sh'
8179
- 'cores/**'
8280
- 'package/**'
8381
- 'tools/**'
84-
- '!tools/platformio-build.py'
8582
- 'platform.txt'
8683
- 'programmers.txt'
8784
- "variants/esp32/**/*"
@@ -110,18 +107,13 @@ jobs:
110107
- 'Kconfig.projbuild'
111108
- 'CMakeLists.txt'
112109
- "variants/esp32c2/**/*"
113-
platformio:
114-
- 'package.json'
115-
- '.github/scripts/install-platformio-esp32.sh'
116-
- 'tools/platformio-build.py'
117110
118111
- name: Set chunks
119112
id: set-chunks
120113
env:
121114
LIB_FILES: ${{ steps.changed-files.outputs.libraries_all_changed_files }}
122115
IS_PR: ${{ github.event_name == 'pull_request' }}
123116
MAX_CHUNKS: ${{ env.MAX_CHUNKS }}
124-
BUILD_PLATFORMIO: ${{ steps.changed-files.outputs.platformio_any_changed == 'true' }}
125117
BUILD_IDF: ${{ steps.changed-files.outputs.idf_any_changed == 'true' }}
126118
BUILD_LIBRARIES: ${{ steps.changed-files.outputs.libraries_any_changed == 'true' }}
127119
BUILD_STATIC_SKETCHES: ${{ steps.changed-files.outputs.static_sketeches_any_changed == 'true' }}
@@ -212,28 +204,6 @@ jobs:
212204
- name: Build Sketches
213205
run: bash ./.github/scripts/on-push.sh
214206

215-
# PlatformIO on Windows, Ubuntu and Mac
216-
build-platformio:
217-
name: PlatformIO on ${{ matrix.os }}
218-
needs: gen-chunks
219-
if: |
220-
needs.gen-chunks.outputs.build_all == 'true' ||
221-
needs.gen-chunks.outputs.build_static_sketches == 'true' ||
222-
needs.gen-chunks.outputs.build_platformio == 'true'
223-
runs-on: ${{ matrix.os }}
224-
strategy:
225-
fail-fast: false
226-
matrix:
227-
os: [ubuntu-latest, windows-latest, macOS-latest]
228-
229-
steps:
230-
- uses: actions/checkout@v4
231-
- uses: actions/setup-python@v5
232-
with:
233-
python-version: '3.x'
234-
- name: Build Sketches
235-
run: bash ./.github/scripts/on-push.sh 1 1 #equal and non-zero to trigger PIO
236-
237207
build-esp-idf-component:
238208
name: Build with ESP-IDF ${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
239209
needs: gen-chunks

Diff for: ‎platform.txt

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ compiler.warning_flags.more=-Wall
4747
compiler.warning_flags.all=-Wall -Wextra
4848

4949
# Additional flags specific to Arduino (not based on IDF flags).
50-
# Update tools/platformio-build.py when changing these flags.
5150
compiler.common_werror_flags=-Werror=return-type
5251

5352
# Compile Flags

0 commit comments

Comments
 (0)