Skip to content

Commit ad26465

Browse files
committed
ci: Don't pass the target, extract it from the FQBN.
Signed-off-by: Abdelatif Guettouche <[email protected]>
1 parent 4d8daa6 commit ad26465

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,18 @@ function count_sketches() # count_sketches <examples-path> <target-mcu>
143143
return $sketchnum
144144
}
145145

146-
function build_sketches() # build_sketches <fqbn> <target-mcu> <examples-path> <chunk> <total-chunks> [extra-options]
146+
function build_sketches() # build_sketches <fqbn> <examples-path> <chunk> <total-chunks> [extra-options]
147147
{
148148
local fqbn=$1
149-
local target="$2"
150149
local examples=$3
151150
local chunk_idex=$4
152151
local chunks_num=$5
153152
local xtra_opts=$6
153+
local target=`echo $fqbn | cut -d":" -f3`
154154

155155
if [ "$#" -lt 3 ]; then
156156
echo "ERROR: Illegal number of parameters"
157-
echo "USAGE: build_sketches <fqbn> <target-mcu <examples-path> [<chunk> <total-chunks>] [extra-options]"
157+
echo "USAGE: build_sketches <fqbn> <examples-path> [<chunk> <total-chunks>] [extra-options]"
158158
return 1
159159
fi
160160

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

+3-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ fi
2424

2525
if [ "$BUILD_PIO" -eq 0 ]; then
2626
# ArduinoIDE ESP32 Test
27-
TARGET="esp32"
2827
FQBN="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app"
2928
source ./.github/scripts/install-arduino-ide.sh
3029
source ./.github/scripts/install-arduino-core-esp32.sh
@@ -43,11 +42,10 @@ if [ "$BUILD_PIO" -eq 0 ]; then
4342
if [ "$CHUNK_INDEX" -eq 0 ]; then
4443
bash "$ARDUINO_ESP32_PATH/.github/scripts/check-cmakelists.sh"
4544
fi
46-
build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
45+
build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
4746
fi
4847

4948
# ArduinoIDE ESP32S2 Test
50-
TARGET="esp32s2"
5149
FQBN="espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app"
5250
if [ "$OS_IS_WINDOWS" == "1" ]; then
5351
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
@@ -56,11 +54,10 @@ if [ "$BUILD_PIO" -eq 0 ]; then
5654
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
5755
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
5856
else
59-
build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
57+
build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
6058
fi
6159

6260
# ArduinoIDE ESP32C3 Test
63-
TARGET="esp32c3"
6461
FQBN="espressif:esp32:esp32c3:PartitionScheme=huge_app"
6562
if [ "$OS_IS_WINDOWS" == "1" ]; then
6663
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
@@ -69,7 +66,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
6966
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
7067
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
7168
else
72-
build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
69+
build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
7370
fi
7471
else
7572
source ./.github/scripts/install-platformio-esp32.sh

0 commit comments

Comments
 (0)