Skip to content

Commit c230609

Browse files
committed
ci(append): Add option to append to all FQBNs
1 parent 9d03c86 commit c230609

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

Diff for: .github/scripts/sketch_utils.sh

+13-6
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,21 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
8383

8484
len=1
8585

86+
if [ -f $sketchdir/ci.json ]; then
87+
fqbn_append=`jq -r '.fqbn_append' $sketchdir/ci.json`
88+
if [ $fqbn_append == "null" ]; then
89+
fqbn_append=""
90+
fi
91+
fi
92+
8693
# Default FQBN options if none were passed in the command line.
8794

88-
esp32_opts="PSRAM=enabled,FlashMode=dio"
89-
esp32s2_opts="PSRAM=enabled,FlashMode=dio"
90-
esp32s3_opts="PSRAM=opi,USBMode=default,FlashMode=dio"
91-
esp32c3_opts="FlashMode=dio"
92-
esp32c6_opts="FlashMode=dio"
93-
esp32h2_opts="FlashMode=dio"
95+
esp32_opts="PSRAM=enabled,FlashMode=dio${fqbn_append:+,$fqbn_append}"
96+
esp32s2_opts="PSRAM=enabled,FlashMode=dio${fqbn_append:+,$fqbn_append}"
97+
esp32s3_opts="PSRAM=opi,USBMode=default,FlashMode=dio${fqbn_append:+,$fqbn_append}"
98+
esp32c3_opts="FlashMode=dio${fqbn_append:+,$fqbn_append}"
99+
esp32c6_opts="FlashMode=dio${fqbn_append:+,$fqbn_append}"
100+
esp32h2_opts="FlashMode=dio${fqbn_append:+,$fqbn_append}"
94101

95102
# Select the common part of the FQBN based on the target. The rest will be
96103
# appended depending on the passed options.

Diff for: .github/scripts/tests_run.sh

-4
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@ function run_test() {
131131
SCRIPTS_DIR="./.github/scripts"
132132
COUNT_SKETCHES="${SCRIPTS_DIR}/sketch_utils.sh count"
133133

134-
if [ -d $ARDUINO_ESP32_PATH/tools/esp32-arduino-libs ]; then
135-
SDKCONFIG_DIR="$ARDUINO_ESP32_PATH/tools/esp32-arduino-libs"
136-
fi
137-
138134
platform="hardware"
139135
wokwi_timeout=60000
140136
chunk_run=0

0 commit comments

Comments
 (0)