Skip to content

Commit e6f2769

Browse files
committed
ci(push): Use fqbn from ci.json
1 parent 7693a16 commit e6f2769

File tree

1 file changed

+12
-20
lines changed

1 file changed

+12
-20
lines changed

.github/scripts/on-push.sh

+12-20
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@ export ARDUINO_BUILD_DIR="$HOME/.arduino/build.tmp"
66

77
function build(){
88
local target=$1
9-
local fqbn=$2
10-
local chunk_index=$3
11-
local chunks_cnt=$4
12-
local build_log=$5
13-
local sketches_file=$6
14-
shift; shift; shift; shift; shift; shift;
9+
local chunk_index=$2
10+
local chunks_cnt=$3
11+
local build_log=$4
12+
local sketches_file=$5
13+
shift; shift; shift; shift; shift;
1514
local sketches=$*
1615

1716
local BUILD_SKETCH="${SCRIPTS_DIR}/sketch_utils.sh build"
1817
local BUILD_SKETCHES="${SCRIPTS_DIR}/sketch_utils.sh chunk_build"
1918

2019
local args="-ai $ARDUINO_IDE_PATH -au $ARDUINO_USR_PATH"
2120

22-
args+=" -t $target -fqbn $fqbn"
21+
args+=" -t $target"
2322

2423
if [ "$OS_IS_LINUX" == "1" ]; then
2524
args+=" -p $ARDUINO_ESP32_PATH/libraries"
@@ -77,13 +76,6 @@ if [ "$BUILD_PIO" -eq 0 ]; then
7776
source ${SCRIPTS_DIR}/install-arduino-cli.sh
7877
source ${SCRIPTS_DIR}/install-arduino-core-esp32.sh
7978

80-
FQBN_ESP32="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app"
81-
FQBN_ESP32S2="espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app"
82-
FQBN_ESP32S3="espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app"
83-
FQBN_ESP32C3="espressif:esp32:esp32c3:PartitionScheme=huge_app"
84-
FQBN_ESP32C6="espressif:esp32:esp32c6:PartitionScheme=huge_app"
85-
FQBN_ESP32H2="espressif:esp32:esp32h2:PartitionScheme=huge_app"
86-
8779
SKETCHES_ESP32="\
8880
$ARDUINO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino\
8981
$ARDUINO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino\
@@ -99,12 +91,12 @@ if [ "$BUILD_PIO" -eq 0 ]; then
9991
fi
10092

10193
#build sketches for different targets
102-
build "esp32s3" $FQBN_ESP32S3 "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
103-
build "esp32s2" $FQBN_ESP32S2 "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
104-
build "esp32c3" $FQBN_ESP32C3 "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
105-
build "esp32c6" $FQBN_ESP32C6 "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
106-
build "esp32h2" $FQBN_ESP32H2 "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
107-
build "esp32" $FQBN_ESP32 "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "$SKETCHES_ESP32"
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"
108100

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

0 commit comments

Comments
 (0)