feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

try s2 ci

Browse Source
This commit is contained in:
me-no-dev
2020-05-12 01:02:03 +03:00
parent 2326f91bc9
commit 7e06b32ce3
2 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
.github/scripts/install-platformio-esp32.sh vendored
View File

@ -25,19 +25,20 @@ fi
echo "PlatformIO for ESP32 has been installed" echo "PlatformIO for ESP32 has been installed"
echo "" echo ""
function build_pio_sketch(){ # build_pio_sketch <board> <path-to-ino> function build_pio_sketch(){ # build_pio_sketch <board> <options> <path-to-ino>
if [ "$#" -lt 2 ]; then if [ "$#" -lt 3 ]; then
echo "ERROR: Illegal number of parameters" echo "ERROR: Illegal number of parameters"
echo "USAGE: build_pio_sketch <board> <path-to-ino>" echo "USAGE: build_pio_sketch <board> <options> <path-to-ino>"
return 1 return 1
fi fi
local board="$1" local board="$1"
local sketch="$2" local options="$2"
local sketch="$3"
local sketch_dir=$(dirname "$sketch") local sketch_dir=$(dirname "$sketch")
echo "" echo ""
echo "Compiling '"$(basename "$sketch")"' ..." echo "Compiling '"$(basename "$sketch")"' ..."
python -m platformio ci --board "$board" "$sketch_dir" --project-option="board_build.partitions = huge_app.csv" python -m platformio ci --board "$board" "$sketch_dir" --project-option="$options"
} }
function count_sketches() # count_sketches <examples-path> function count_sketches() # count_sketches <examples-path>
@ -66,20 +67,21 @@ function count_sketches() # count_sketches <examples-path>
return $sketchnum return $sketchnum
} }
function build_pio_sketches() # build_pio_sketches <board> <examples-path> <chunk> <total-chunks> function build_pio_sketches() # build_pio_sketches <board> <options> <examples-path> <chunk> <total-chunks>
{ {
if [ "$#" -lt 2 ]; then if [ "$#" -lt 3 ]; then
echo "ERROR: Illegal number of parameters" echo "ERROR: Illegal number of parameters"
echo "USAGE: build_pio_sketches <board> <examples-path> [<chunk> <total-chunks>]" echo "USAGE: build_pio_sketches <board> <options> <examples-path> [<chunk> <total-chunks>]"
return 1 return 1
fi fi
local board=$1 local board=$1
local examples=$2 local options="$2"
local chunk_idex=$3 local examples=$3
local chunks_num=$4 local chunk_idex=$4
local chunks_num=$5
if [ "$#" -lt 4 ]; then if [ "$#" -lt 5 ]; then
chunk_idex="0" chunk_idex="0"
chunks_num="1" chunks_num="1"
fi fi
@ -138,7 +140,7 @@ function build_pio_sketches() # build_pio_sketches <board> <examples-path> <chun
|| [ "$sketchnum" -gt "$end_index" ]; then || [ "$sketchnum" -gt "$end_index" ]; then
continue continue
fi fi
build_pio_sketch "$board" "$sketch" build_pio_sketch "$board" "$options" "$sketch"
local result=$? local result=$?
if [ $result -ne 0 ]; then if [ $result -ne 0 ]; then
return $result return $result

34
.github/scripts/on-push.sh vendored
View File

@ -34,7 +34,7 @@ fi
#git -C "$GITHUB_WORKSPACE" submodule update --init --recursive > /dev/null 2>&1 #git -C "$GITHUB_WORKSPACE" submodule update --init --recursive > /dev/null 2>&1
if [ "$BUILD_PIO" -eq 0 ]; then if [ "$BUILD_PIO" -eq 0 ]; then
# ArduinoIDE Test # ArduinoIDE ESP32 Test
FQBN="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app" FQBN="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app"
source ./.github/scripts/install-arduino-ide.sh source ./.github/scripts/install-arduino-ide.sh
source ./.github/scripts/install-arduino-core-esp32.sh source ./.github/scripts/install-arduino-core-esp32.sh
@ -55,14 +55,32 @@ if [ "$BUILD_PIO" -eq 0 ]; then
fi fi
build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT" build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
fi fi
# ArduinoIDE ESP32S2 Test
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" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
elif [ "$OS_IS_MACOS" == "1" ]; 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" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
else
else else
# PlatformIO Test
source ./.github/scripts/install-platformio-esp32.sh source ./.github/scripts/install-platformio-esp32.sh
# PlatformIO ESP32 Test
BOARD="esp32dev" BOARD="esp32dev"
build_pio_sketch "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \ OPTIONS="board_build.partitions = huge_app.csv"
build_pio_sketch "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \ build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
build_pio_sketch "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \ build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \
build_pio_sketch "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \ build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \
build_pio_sketch "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino" build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
#build_pio_sketches esp32dev "$PLATFORMIO_ESP32_PATH/libraries" build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
# PlatformIO ESP32 Test
OPTIONS="board_build.mcu = esp32s2"
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
#build_pio_sketches "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries"
fi fi