ci: Don't pass the target, extract it from the FQBN.

Signed-off-by: Abdelatif Guettouche <[email protected]>
espressif · Jan 17, 2022 · ad26465 · ad26465
1 parent 4d8daa6
commit ad26465
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/.github/scripts/install-arduino-ide.sh b/.github/scripts/install-arduino-ide.sh
@@ -143,18 +143,18 @@ function count_sketches() # count_sketches <examples-path> <target-mcu>
  return $sketchnum
 }
 
-function build_sketches() # build_sketches <fqbn> <target-mcu> <examples-path> <chunk> <total-chunks> [extra-options]
+function build_sketches() # build_sketches <fqbn> <examples-path> <chunk> <total-chunks> [extra-options]
 {
  local fqbn=$1
- local target="$2"
  local examples=$3
  local chunk_idex=$4
  local chunks_num=$5
  local xtra_opts=$6
+ local target=`echo $fqbn | cut -d":" -f3`
 
  if [ "$#" -lt 3 ]; then
  echo "ERROR: Illegal number of parameters"
- echo "USAGE: build_sketches <fqbn> <target-mcu <examples-path> [<chunk> <total-chunks>] [extra-options]"
+ echo "USAGE: build_sketches <fqbn> <examples-path> [<chunk> <total-chunks>] [extra-options]"
  return 1
  fi
 

diff --git a/.github/scripts/on-push.sh b/.github/scripts/on-push.sh
@@ -24,7 +24,6 @@ fi
 
 if [ "$BUILD_PIO" -eq 0 ]; then
  # ArduinoIDE ESP32 Test
- TARGET="esp32"
  FQBN="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app"
  source ./.github/scripts/install-arduino-ide.sh
  source ./.github/scripts/install-arduino-core-esp32.sh
@@ -43,11 +42,10 @@ if [ "$BUILD_PIO" -eq 0 ]; then
  if [ "$CHUNK_INDEX" -eq 0 ]; then
  bash "$ARDUINO_ESP32_PATH/.github/scripts/check-cmakelists.sh"
  fi
- build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
+ build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
  fi
 
  # ArduinoIDE ESP32S2 Test
- TARGET="esp32s2"
  FQBN="espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app"
  if [ "$OS_IS_WINDOWS" == "1" ]; then
  build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
@@ -56,11 +54,10 @@ if [ "$BUILD_PIO" -eq 0 ]; then
  build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
  build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
  else
- build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
+ build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
  fi
 
  # ArduinoIDE ESP32C3 Test
- TARGET="esp32c3"
  FQBN="espressif:esp32:esp32c3:PartitionScheme=huge_app"
  if [ "$OS_IS_WINDOWS" == "1" ]; then
  build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
@@ -69,7 +66,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
  build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
  build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
  else
- build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
+ build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
  fi
 else
  source ./.github/scripts/install-platformio-esp32.sh