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 dc3fc9a

Browse files
committedDec 4, 2024··
fix
1 parent 48585a0 commit dc3fc9a

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed
 

‎.github/scripts/on-push.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ if [ "$BUILD_PIO" -eq 0 ]; then
7777
source ${SCRIPTS_DIR}/install-arduino-cli.sh
7878
source ${SCRIPTS_DIR}/install-arduino-core-esp32.sh
7979

80-
SKETCHES_ESP32="\
81-
$ARDUINO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino \
82-
$ARDUINO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino \
83-
$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino \
84-
$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino \
85-
"
80+
SKETCHES_ESP32=(
81+
"$ARDUINO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
82+
"$ARDUINO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino"
83+
"$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
84+
"$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino"
85+
)
8686
#create sizes_file
8787
sizes_file="$GITHUB_WORKSPACE/cli_compile_$CHUNK_INDEX.json"
8888

@@ -92,12 +92,12 @@ if [ "$BUILD_PIO" -eq 0 ]; then
9292
fi
9393

9494
#build sketches for different targets
95-
build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
96-
build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
97-
build "esp32c3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
98-
build "esp32c6" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
99-
build "esp32h2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
100-
build "esp32" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
95+
build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
96+
build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
97+
build "esp32c3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
98+
build "esp32c6" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
99+
build "esp32h2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
100+
build "esp32" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
101101

102102
if [ "$BUILD_LOG" -eq 1 ]; then
103103
#remove last comma from the last JSON object

‎.github/scripts/sketch_utils.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
268268
--board-options "$curroptions" \
269269
--warnings "all" \
270270
--build-property "compiler.warning_flags.all=-Wall -Werror=all -Wextra" \
271-
--build-cache-path "$ARDUINO_CACHE_DIR" \
272271
--build-path "$build_dir" \
273272
"${xtra_opts[@]}" "${sketchdir}" \
274273
2>&1 | tee "$output_file"

0 commit comments

Comments
 (0)
Please sign in to comment.