From 07187db5bf037d8e830189b59e1453cf2fb7a0a0 Mon Sep 17 00:00:00 2001 From: Gijs Noorlander Date: Tue, 19 Nov 2019 10:37:10 +0100 Subject: [PATCH] [PIO] Only build needed environments --- .travis.yml | 1 + before_deploy | 1 + platformio.ini | 8 ++++---- tools/build_ESPeasy.sh | 36 ++++++++++++++++++++++++++++++++++-- 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d263bce66..114f8c306 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ script: # - cppcheck --enable=warning src/*.ino -q --force -I src --include=src/ESPEasy.ino --error-exitcode=1 # - ./memanalyzer.py ~/.platformio/packages/toolchain-xtensa/bin/xtensa-lx106-elf-objdump # - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run --target clean + # Same list as in tools/build_ESPeasy.sh and before_deploy - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e custom_ESP32_4M316k - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e custom_ESP8266_4M1M - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e custom_ESP8266_4M2M diff --git a/before_deploy b/before_deploy index b0afa7906..5a4bb2962 100755 --- a/before_deploy +++ b/before_deploy @@ -39,6 +39,7 @@ fi mkdir -p ${TMP_DIST}/memstats +# Same list in .travis.yml and tools/build_ESPeasy.sh for ENV in \ custom_ESP32_4M316k\ custom_ESP8266_4M1M\ diff --git a/platformio.ini b/platformio.ini index 056f447a2..1e8a304ca 100644 --- a/platformio.ini +++ b/platformio.ini @@ -12,10 +12,10 @@ [platformio] description = Firmware for ESP82xx/ESP32 for easy IoT deployment of sensors. -env_default = custom_ESP8266_4M1M, custom_ESP32_4M316k -;env_default = dev_ESP8266_4M1M -;env_default = normal_ESP8266_4M1M -;env_default = test_beta_ESP8266_4M1M +default_envs = custom_ESP8266_4M1M, custom_ESP32_4M316k +;default_envs = dev_ESP8266_4M1M +;default_envs = normal_ESP8266_4M1M +;default_envs = test_beta_ESP8266_4M1M ; ..etc ;build_cache_dir = $PROJECT_DIR\.buildcache diff --git a/tools/build_ESPeasy.sh b/tools/build_ESPeasy.sh index 72a5bf082..ba79b3291 100755 --- a/tools/build_ESPeasy.sh +++ b/tools/build_ESPeasy.sh @@ -75,8 +75,40 @@ platformio run --target clean cd ${SRC}/patches; ./check_puya_patch; cd ${SRC} -# Build all targets in the platformio.ini file. -PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run +# Build all targets in the platformio.ini file. (same as in .travis.yml and before_deploy) +for ENV in \ + custom_ESP32_4M316k\ + custom_ESP8266_4M1M\ + custom_ESP8266_4M2M\ + dev_ESP8266_4M1M\ + esp-wrover-kit_test_4M316k\ + esp32test_4M316k\ + hard_SONOFF_POW_4M1M\ + hard_Shelly_1_2M256\ + hard_Ventus_W266\ + hard_other_POW_ESP8285_1M\ + minimal_IRext_ESP8266_1M\ + minimal_IRext_ESP8266_4M1M\ + minimal_IRext_ESP8266_4M2M\ + minimal_core_242_ESP8266_1M_OTA\ + minimal_core_242_ESP8285_1M_OTA\ + minimal_core_261_ESP8266_1M_OTA\ + minimal_core_261_ESP8285_1M_OTA\ + normal_ESP8266_16M\ + normal_ESP8266_1M\ + normal_ESP8266_1M_VCC\ + normal_ESP8266_4M1M\ + normal_ESP8285_1M\ + normal_IRext_no_rx_ESP8266_4M2M\ + normal_WROOM02_2M256\ + normal_WROOM02_2M\ + test_ESP8266_4M_VCC\ + test_beta_ESP8266_16M\ + test_beta_ESP8266_4M1M;\ +do + PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e ${ENV} +done + #for ENV in `grep "^\[env:" platformio.ini |cut -d':' -f2|cut -d']' -f1`; #do