From d68f9e80e940a13d8eb0d74852aa3c0a3b7becf1 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Mon, 19 Aug 2019 19:49:42 +0300 Subject: [PATCH 01/16] Try github CI --- .github/workflows/main.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000000..5af14be52f4 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,15 @@ +name: CI + +on: [push, pull_request] + +jobs: + build: + name: Build Test + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Run a one-line script + env: + ESP32_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: bash ./tools/build.sh From fa67685c903a4488c1431400028e9464bfc01047 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Mon, 19 Aug 2019 20:01:39 +0300 Subject: [PATCH 02/16] Update main.yml --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5af14be52f4..ca48f236b42 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,8 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Run a one-line script env: ESP32_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Build Test Sketches run: bash ./tools/build.sh From e91ac7333f7f369d1f77dab89baa01fd78af42e5 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Mon, 19 Aug 2019 20:04:57 +0300 Subject: [PATCH 03/16] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ca48f236b42..c3790db323c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,10 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - env: - ESP32_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: actions/checkout@v1 - name: Pull submodules run: git submodule update --init --recursive - name: Build Test Sketches + env: + ESP32_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: bash ./tools/build.sh From 8d42725a08921eefccad564051f6a993ba0ccb01 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Mon, 19 Aug 2019 20:36:55 +0300 Subject: [PATCH 04/16] Update main.yml --- .github/workflows/main.yml | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c3790db323c..793ca5c871c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,9 +9,36 @@ jobs: steps: - uses: actions/checkout@v1 + - name: Dump GitHub context + env: + GITHUB_CONTEXT: ${{ toJson(github) }} + run: echo "$GITHUB_CONTEXT" + - name: Dump strategy context + env: + STRATEGY_CONTEXT: ${{ toJson(strategy) }} + run: echo "$STRATEGY_CONTEXT" + - name: Dump matrix context + env: + MATRIX_CONTEXT: ${{ toJson(matrix) }} + run: echo "$MATRIX_CONTEXT" + - name: Dump job context + env: + JOB_CONTEXT: ${{ toJson(job) }} + run: echo "$JOB_CONTEXT" + - name: Dump runner context + env: + RUNNER_CONTEXT: ${{ toJson(runner) }} + run: echo "$RUNNER_CONTEXT" + - name: Dump steps context + env: + STEPS_CONTEXT: ${{ toJson(steps) }} + run: echo "$STEPS_CONTEXT" - name: Pull submodules run: git submodule update --init --recursive + - name: Run CMake Check + run: bash ./tools/check_cmakelists.sh - name: Build Test Sketches env: ESP32_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: bash ./tools/build.sh + TRAVIS_BUILD_DIR: /home/runner/work/arduino-esp32/arduino-esp32 + run: bash ./tools/build-tests.sh From 49a0de7adbeac63273031be03fd04a10046a54fb Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Mon, 19 Aug 2019 21:30:06 +0300 Subject: [PATCH 05/16] Update main.yml --- .github/workflows/main.yml | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 793ca5c871c..af6416094f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ name: CI -on: [push, pull_request] +on: [push] jobs: build: @@ -9,36 +9,15 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Dump GitHub context - env: - GITHUB_CONTEXT: ${{ toJson(github) }} - run: echo "$GITHUB_CONTEXT" - - name: Dump strategy context - env: - STRATEGY_CONTEXT: ${{ toJson(strategy) }} - run: echo "$STRATEGY_CONTEXT" - - name: Dump matrix context - env: - MATRIX_CONTEXT: ${{ toJson(matrix) }} - run: echo "$MATRIX_CONTEXT" - - name: Dump job context - env: - JOB_CONTEXT: ${{ toJson(job) }} - run: echo "$JOB_CONTEXT" - - name: Dump runner context - env: - RUNNER_CONTEXT: ${{ toJson(runner) }} - run: echo "$RUNNER_CONTEXT" - - name: Dump steps context - env: - STEPS_CONTEXT: ${{ toJson(steps) }} - run: echo "$STEPS_CONTEXT" - name: Pull submodules run: git submodule update --init --recursive - name: Run CMake Check run: bash ./tools/check_cmakelists.sh + - name: Install Python Wheel + run: pip install wheel - name: Build Test Sketches env: ESP32_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TRAVIS_BUILD_DIR: /home/runner/work/arduino-esp32/arduino-esp32 + GITHUB_EVENT_NAME: ${{ github.event_name }} + TRAVIS_BUILD_DIR: ${{ github.workspace }} run: bash ./tools/build-tests.sh From 0cc400e6d5bff857f5e3c4bc76e13bd86b217646 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Mon, 19 Aug 2019 22:50:57 +0300 Subject: [PATCH 06/16] try only PIO --- tools/build-tests.sh | 38 ++++++++++++++++++++------------------ tools/common.sh | 2 -- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/build-tests.sh b/tools/build-tests.sh index 3abed4ec142..bf90e035b4d 100755 --- a/tools/build-tests.sh +++ b/tools/build-tests.sh @@ -21,20 +21,8 @@ cd esp32 git submodule update --init --recursive cd tools python get.py -cd $TRAVIS_BUILD_DIR -export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin:$PATH" -source tools/common.sh echo -e "travis_fold:end:sketch_test_env_prepare" -echo -e "travis_fold:start:sketch_test" -build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries" -if [ $? -ne 0 ]; then exit 1; fi -echo -e "travis_fold:end:sketch_test" - -echo -e "travis_fold:start:size_report" -cat size.log -echo -e "travis_fold:end:size_report" - echo -e "travis_fold:start:platformio_test_env_prepare" pip install -U https://github.com/platformio/platformio/archive/develop.zip && \ platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage && \ @@ -43,12 +31,26 @@ ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif32 if [ $? -ne 0 ]; then exit 1; fi echo -e "travis_fold:end:platformio_test_env_prepare" +echo "PATH=$PATH" + +# echo -e "travis_fold:start:sketch_test" +# cd $TRAVIS_BUILD_DIR +# export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin:$PATH" +# source tools/common.sh +# build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries" +# if [ $? -ne 0 ]; then exit 1; fi +# echo -e "travis_fold:end:sketch_test" + +# echo -e "travis_fold:start:size_report" +# cat size.log +# echo -e "travis_fold:end:size_report" + echo -e "travis_fold:start:platformio_test" -platformio ci --board esp32dev libraries/WiFi/examples/WiFiClient && \ -platformio ci --board esp32dev libraries/WiFiClientSecure/examples/WiFiClientSecure && \ -platformio ci --board esp32dev libraries/BluetoothSerial/examples/SerialToSerialBT && \ -platformio ci --board esp32dev libraries/BLE/examples/BLE_server && \ -platformio ci --board esp32dev libraries/AzureIoT/examples/GetStarted && \ -platformio ci --board esp32dev libraries/ESP32/examples/Camera/CameraWebServer --project-option="board_build.partitions = huge_app.csv" +python -m platformio ci --board esp32dev libraries/WiFi/examples/WiFiClient && \ +python -m platformio ci --board esp32dev libraries/WiFiClientSecure/examples/WiFiClientSecure && \ +python -m platformio ci --board esp32dev libraries/BluetoothSerial/examples/SerialToSerialBT && \ +python -m platformio ci --board esp32dev libraries/BLE/examples/BLE_server && \ +python -m platformio ci --board esp32dev libraries/AzureIoT/examples/GetStarted && \ +python -m platformio ci --board esp32dev libraries/ESP32/examples/Camera/CameraWebServer --project-option="board_build.partitions = huge_app.csv" if [ $? -ne 0 ]; then exit 1; fi echo -e "travis_fold:end:platformio_test" diff --git a/tools/common.sh b/tools/common.sh index 0cb50a10465..b29202868c2 100755 --- a/tools/common.sh +++ b/tools/common.sh @@ -55,8 +55,6 @@ function build_sketches() continue fi echo -e "\n ------------ Building $sketch ------------ \n"; - # $arduino --verify $sketch; - #echo "$build_cmd $sketch" time ($build_cmd $sketch >build.log) local result=$? if [ $result -ne 0 ]; then From 358e9dc72f75a77663cce3c5013bf91b3c4fff2f Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Mon, 19 Aug 2019 22:53:51 +0300 Subject: [PATCH 07/16] missed one call to platformio --- tools/build-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-tests.sh b/tools/build-tests.sh index bf90e035b4d..44030c34c11 100755 --- a/tools/build-tests.sh +++ b/tools/build-tests.sh @@ -25,7 +25,7 @@ echo -e "travis_fold:end:sketch_test_env_prepare" echo -e "travis_fold:start:platformio_test_env_prepare" pip install -U https://github.com/platformio/platformio/archive/develop.zip && \ -platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage && \ +python -m platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage && \ sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32/platform.json && \ ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif32 if [ $? -ne 0 ]; then exit 1; fi From 73c56d76edc35b3f4b514297f5e6ea07f4d16c96 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Mon, 19 Aug 2019 23:01:27 +0300 Subject: [PATCH 08/16] fix path --- tools/build-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-tests.sh b/tools/build-tests.sh index 44030c34c11..d130e3fc77e 100755 --- a/tools/build-tests.sh +++ b/tools/build-tests.sh @@ -32,9 +32,9 @@ if [ $? -ne 0 ]; then exit 1; fi echo -e "travis_fold:end:platformio_test_env_prepare" echo "PATH=$PATH" +cd $TRAVIS_BUILD_DIR # echo -e "travis_fold:start:sketch_test" -# cd $TRAVIS_BUILD_DIR # export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin:$PATH" # source tools/common.sh # build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries" From 6aba3a8920e00505800620fdc180fdf5db2424e5 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Tue, 20 Aug 2019 00:08:17 +0300 Subject: [PATCH 09/16] split build steps --- .github/workflows/main.yml | 18 +++++++++++++-- tools/build-tests.sh | 45 +++++++++----------------------------- tools/check_cmakelists.sh | 4 +++- tools/prep-arduino-ide.sh | 13 +++++++++++ tools/prep-platformio.sh | 6 +++++ tools/test-arduino-ide.sh | 6 +++++ tools/test-platformio.sh | 9 ++++++++ 7 files changed, 63 insertions(+), 38 deletions(-) create mode 100755 tools/prep-arduino-ide.sh create mode 100755 tools/prep-platformio.sh create mode 100755 tools/test-arduino-ide.sh create mode 100755 tools/test-platformio.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index af6416094f0..0caff39c6b7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,9 +15,23 @@ jobs: run: bash ./tools/check_cmakelists.sh - name: Install Python Wheel run: pip install wheel - - name: Build Test Sketches + - name: Install Arduino IDE env: ESP32_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_EVENT_NAME: ${{ github.event_name }} TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: bash ./tools/build-tests.sh + run: bash ./tools/prep-arduino-ide.sh + - name: Install PlatformIO + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: bash ./tools/prep-platformio.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: bash ./tools/test-arduino-ide.sh + - name: Sketch Sizes + run: cat size.log + - name: Test PlatformIO + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: bash ./tools/test-platformio.sh diff --git a/tools/build-tests.sh b/tools/build-tests.sh index d130e3fc77e..a3f951067fa 100755 --- a/tools/build-tests.sh +++ b/tools/build-tests.sh @@ -1,56 +1,31 @@ #!/bin/bash -#- set -e - if [ ! -z "$TRAVIS_TAG" ]; then echo "No sketch builds & tests required for tagged TravisCI builds, exiting" exit 0 fi echo -e "travis_fold:start:sketch_test_env_prepare" -pip install pyserial -wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz -tar xf arduino.tar.xz -mv arduino-nightly $HOME/arduino_ide -mkdir -p $HOME/Arduino/libraries -cd $HOME/arduino_ide/hardware -mkdir espressif -cd espressif -ln -s $TRAVIS_BUILD_DIR esp32 -cd esp32 -git submodule update --init --recursive -cd tools -python get.py +tools/prep-arduino-ide.sh echo -e "travis_fold:end:sketch_test_env_prepare" echo -e "travis_fold:start:platformio_test_env_prepare" -pip install -U https://github.com/platformio/platformio/archive/develop.zip && \ -python -m platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage && \ -sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32/platform.json && \ -ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif32 +tools/prep-platformio.sh if [ $? -ne 0 ]; then exit 1; fi echo -e "travis_fold:end:platformio_test_env_prepare" -echo "PATH=$PATH" cd $TRAVIS_BUILD_DIR -# echo -e "travis_fold:start:sketch_test" -# export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin:$PATH" -# source tools/common.sh -# build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries" -# if [ $? -ne 0 ]; then exit 1; fi -# echo -e "travis_fold:end:sketch_test" +echo -e "travis_fold:start:sketch_test" +tools/test-arduino-ide.sh +if [ $? -ne 0 ]; then exit 1; fi +echo -e "travis_fold:end:sketch_test" -# echo -e "travis_fold:start:size_report" -# cat size.log -# echo -e "travis_fold:end:size_report" +echo -e "travis_fold:start:size_report" +cat size.log +echo -e "travis_fold:end:size_report" echo -e "travis_fold:start:platformio_test" -python -m platformio ci --board esp32dev libraries/WiFi/examples/WiFiClient && \ -python -m platformio ci --board esp32dev libraries/WiFiClientSecure/examples/WiFiClientSecure && \ -python -m platformio ci --board esp32dev libraries/BluetoothSerial/examples/SerialToSerialBT && \ -python -m platformio ci --board esp32dev libraries/BLE/examples/BLE_server && \ -python -m platformio ci --board esp32dev libraries/AzureIoT/examples/GetStarted && \ -python -m platformio ci --board esp32dev libraries/ESP32/examples/Camera/CameraWebServer --project-option="board_build.partitions = huge_app.csv" +tools/test-platformio.sh if [ $? -ne 0 ]; then exit 1; fi echo -e "travis_fold:end:platformio_test" diff --git a/tools/check_cmakelists.sh b/tools/check_cmakelists.sh index d23c85a8d0d..4d11359cf80 100755 --- a/tools/check_cmakelists.sh +++ b/tools/check_cmakelists.sh @@ -10,8 +10,10 @@ set -e cd "`dirname $0`/.." # cd to arduino-esp32 root +# pull all submodules +git submodule update --init --recursive + # find all source files in repo -#REPO_SRCS=`find cores/esp32/ libraries/ -name 'examples' -prune -o -name 'main.cpp' -prune -o -name '*.c' -print -o -name '*.cpp' -print | sort` REPO_SRCS=`find cores/esp32/ libraries/ -name 'examples' -prune -o -name '*.c' -print -o -name '*.cpp' -print | sort` # find all source files named in CMakeLists.txt COMPONENT_SRCS diff --git a/tools/prep-arduino-ide.sh b/tools/prep-arduino-ide.sh new file mode 100755 index 00000000000..5eb585d72b2 --- /dev/null +++ b/tools/prep-arduino-ide.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +pip install pyserial +wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz +tar xf arduino.tar.xz +mv arduino-nightly $HOME/arduino_ide +mkdir -p $HOME/Arduino/libraries +cd $HOME/arduino_ide/hardware +mkdir espressif +cd espressif +ln -s $TRAVIS_BUILD_DIR esp32 +cd esp32/tools +python get.py diff --git a/tools/prep-platformio.sh b/tools/prep-platformio.sh new file mode 100755 index 00000000000..dbcb444d25e --- /dev/null +++ b/tools/prep-platformio.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +pip install -U https://github.com/platformio/platformio/archive/develop.zip && \ +python -m platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage && \ +sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32/platform.json && \ +ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif32 diff --git a/tools/test-arduino-ide.sh b/tools/test-arduino-ide.sh new file mode 100755 index 00000000000..65b45474c33 --- /dev/null +++ b/tools/test-arduino-ide.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin:$PATH" +source tools/common.sh +build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries" +if [ $? -ne 0 ]; then exit 1; fi diff --git a/tools/test-platformio.sh b/tools/test-platformio.sh new file mode 100755 index 00000000000..f699595b1c4 --- /dev/null +++ b/tools/test-platformio.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +python -m platformio ci --board esp32dev libraries/WiFi/examples/WiFiClient && \ +python -m platformio ci --board esp32dev libraries/WiFiClientSecure/examples/WiFiClientSecure && \ +python -m platformio ci --board esp32dev libraries/BluetoothSerial/examples/SerialToSerialBT && \ +python -m platformio ci --board esp32dev libraries/BLE/examples/BLE_server && \ +python -m platformio ci --board esp32dev libraries/AzureIoT/examples/GetStarted && \ +python -m platformio ci --board esp32dev libraries/ESP32/examples/Camera/CameraWebServer --project-option="board_build.partitions = huge_app.csv" +if [ $? -ne 0 ]; then exit 1; fi From 10e603e09607ac6a6c492d9b2e0bd3d39a584abc Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Tue, 20 Aug 2019 00:55:31 +0300 Subject: [PATCH 10/16] try two jobs --- .github/workflows/main.yml | 35 ++++++++++++++++++++++++++--------- tools/build-tests.sh | 1 + tools/prep-arduino-ide.sh | 1 + tools/test-arduino-ide.sh | 2 +- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0caff39c6b7..7f5e5328b51 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,10 +1,11 @@ -name: CI +name: ESP32 Arduino CI on: [push] jobs: - build: - name: Build Test + + build-arduino: + name: Build Arduino IDE Tests runs-on: ubuntu-latest steps: @@ -13,24 +14,40 @@ jobs: run: git submodule update --init --recursive - name: Run CMake Check run: bash ./tools/check_cmakelists.sh - - name: Install Python Wheel - run: pip install wheel + - name: Install Arduino IDE env: ESP32_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_EVENT_NAME: ${{ github.event_name }} TRAVIS_BUILD_DIR: ${{ github.workspace }} run: bash ./tools/prep-arduino-ide.sh - - name: Install PlatformIO - env: - TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: bash ./tools/prep-platformio.sh - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} run: bash ./tools/test-arduino-ide.sh - name: Sketch Sizes run: cat size.log + + + build-platformio: + name: Build PlatformIO Tests + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: bash ./tools/check_cmakelists.sh + + - name: Install Python Wheel + run: pip install wheel + - name: Install GCC Toolchain + run: cd tools && python get.py + - name: Install PlatformIO + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: bash ./tools/prep-platformio.sh - name: Test PlatformIO env: TRAVIS_BUILD_DIR: ${{ github.workspace }} diff --git a/tools/build-tests.sh b/tools/build-tests.sh index a3f951067fa..90d18c88da4 100755 --- a/tools/build-tests.sh +++ b/tools/build-tests.sh @@ -7,6 +7,7 @@ fi echo -e "travis_fold:start:sketch_test_env_prepare" tools/prep-arduino-ide.sh +if [ $? -ne 0 ]; then exit 1; fi echo -e "travis_fold:end:sketch_test_env_prepare" echo -e "travis_fold:start:platformio_test_env_prepare" diff --git a/tools/prep-arduino-ide.sh b/tools/prep-arduino-ide.sh index 5eb585d72b2..7dfd1911a22 100755 --- a/tools/prep-arduino-ide.sh +++ b/tools/prep-arduino-ide.sh @@ -5,6 +5,7 @@ wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-li tar xf arduino.tar.xz mv arduino-nightly $HOME/arduino_ide mkdir -p $HOME/Arduino/libraries + cd $HOME/arduino_ide/hardware mkdir espressif cd espressif diff --git a/tools/test-arduino-ide.sh b/tools/test-arduino-ide.sh index 65b45474c33..fe3512e794e 100755 --- a/tools/test-arduino-ide.sh +++ b/tools/test-arduino-ide.sh @@ -2,5 +2,5 @@ export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin:$PATH" source tools/common.sh -build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries" +#build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries" if [ $? -ne 0 ]; then exit 1; fi From 19dde7114b57fb5f4f31bae3774f78ee882fac3e Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Tue, 20 Aug 2019 12:21:20 +0300 Subject: [PATCH 11/16] test multiple arduino jobs --- .github/workflows/main.yml | 38 ++++++--- tools/test-arduino-ide.sh | 154 ++++++++++++++++++++++++++++++++++++- 2 files changed, 181 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7f5e5328b51..ada058623d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: [push] jobs: - build-arduino: + build-arduino-0: name: Build Arduino IDE Tests runs-on: ubuntu-latest @@ -13,18 +13,40 @@ jobs: - name: Pull submodules run: git submodule update --init --recursive - name: Run CMake Check - run: bash ./tools/check_cmakelists.sh + run: ./tools/check_cmakelists.sh - name: Install Arduino IDE env: ESP32_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_EVENT_NAME: ${{ github.event_name }} TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: bash ./tools/prep-arduino-ide.sh + run: ./tools/prep-arduino-ide.sh - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: bash ./tools/test-arduino-ide.sh + run: ./tools/test-arduino-ide.sh 0 9 + - name: Sketch Sizes + run: cat size.log + + build-arduino-1: + name: Build Arduino IDE Tests + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 1 9 - name: Sketch Sizes run: cat size.log @@ -38,7 +60,7 @@ jobs: - name: Pull submodules run: git submodule update --init --recursive - name: Run CMake Check - run: bash ./tools/check_cmakelists.sh + run: ./tools/check_cmakelists.sh - name: Install Python Wheel run: pip install wheel @@ -47,8 +69,6 @@ jobs: - name: Install PlatformIO env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: bash ./tools/prep-platformio.sh + run: ./tools/prep-platformio.sh - name: Test PlatformIO - env: - TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: bash ./tools/test-platformio.sh + run: ./tools/test-platformio.sh diff --git a/tools/test-arduino-ide.sh b/tools/test-arduino-ide.sh index fe3512e794e..c02242c2d42 100755 --- a/tools/test-arduino-ide.sh +++ b/tools/test-arduino-ide.sh @@ -1,6 +1,156 @@ #!/bin/bash -export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin:$PATH" -source tools/common.sh +CHUNK_INDEX=$1 +CHUNKS_CNT=$2 +if [ "$#" -lt 2 ]; then + echo "Building all sketches" + CHUNK_INDEX=0 + CHUNKS_CNT=1 +fi +if [ "$CHUNKS_CNT" -le 0 ]; then + echo "Chunks count must be positive number" + exit 1 +fi +if [ "$CHUNK_INDEX" -ge "$CHUNKS_CNT" ]; then + echo "Chunk index must be less than chunks count" + exit 1 +fi + +export ARDUINO_IDE_PATH=$HOME/arduino_ide +export ARDUINO_LIB_PATH=$HOME/Arduino/libraries +export EXAMPLES_PATH=$TRAVIS_BUILD_DIR/libraries +export EXAMPLES_BUILD_DIR=$TRAVIS_BUILD_DIR/build.tmp +export EXAMPLES_BUILD_CMD="python tools/build.py -b esp32 -v -k -p $EXAMPLES_BUILD_DIR -l $ARDUINO_LIB_PATH " +export EXAMPLES_SIZE_BIN=$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin/xtensa-esp32-elf-size + +function print_size_info() +{ + elf_file=$1 + + if [ -z "$elf_file" ]; then + printf "sketch iram0.text flash.text flash.rodata dram0.data dram0.bss dram flash\n" + return 0 + fi + + elf_name=$(basename $elf_file) + sketch_name="${elf_name%.*}" + # echo $sketch_name + declare -A segments + while read -a tokens; do + seg=${tokens[0]} + seg=${seg//./} + size=${tokens[1]} + addr=${tokens[2]} + if [ "$addr" -eq "$addr" -a "$addr" -ne "0" ] 2>/dev/null; then + segments[$seg]=$size + fi + done < <($EXAMPLES_SIZE_BIN --format=sysv $elf_file) + + total_ram=$((${segments[dram0data]} + ${segments[dram0bss]})) + total_flash=$((${segments[iram0text]} + ${segments[flashtext]} + ${segments[dram0data]} + ${segments[flashrodata]})) + printf "%-32s %-8d %-8d %-8d %-8d %-8d %-8d %-8d\n" $sketch_name ${segments[iram0text]} ${segments[flashtext]} ${segments[flashrodata]} ${segments[dram0data]} ${segments[dram0bss]} $total_ram $total_flash + return 0 +} + +function build_sketch() +{ + local sketch=$1 + echo -e "\n ------------ Building $sketch ------------ \n"; + #return 0 #### + rm -rf $EXAMPLES_BUILD_DIR/* + time ($EXAMPLES_BUILD_CMD $sketch >build.log) + local result=$? + if [ $result -ne 0 ]; then + echo "Build failed ($1)" + echo "Build log:" + cat build.log + return $result + fi + rm build.log + #print_size_info + #print_size_info $EXAMPLES_BUILD_DIR/*.elf + return 0 +} + +function count_sketches() +{ + local sketches=$(find $EXAMPLES_PATH -name *.ino) + local sketchnum=0 + rm -rf sketches.txt + for sketch in $sketches; do + local sketchdir=$(dirname $sketch) + local sketchdirname=$(basename $sketchdir) + local sketchname=$(basename $sketch) + if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then + continue + fi; + if [[ -f "$sketchdir/.test.skip" ]]; then + continue + fi + echo $sketch >> sketches.txt + sketchnum=$(($sketchnum + 1)) + done + return $sketchnum +} + +function build_sketches() +{ + mkdir -p $EXAMPLES_BUILD_DIR + local chunk_idex=$1 + local chunks_num=$2 + count_sketches + local sketchcount=$? + local sketches=$(cat sketches.txt) + echo -e "Sketches: \n$sketches\n" + echo "Found $sketchcount Sketches"; + local chunk_size=$(( $(( $sketchcount / $chunks_num )) + 1 )) + echo "Chunk Size $chunk_size" + local start_index=$(( $chunk_idex * $chunk_size )) + echo "Start $start_index" + local end_index=$(( $(( $chunk_idex + 1 )) * $chunk_size )) + if [ "$end_index" -gt "$sketchcount" ]; then + end_index=$sketchcount + fi + echo "End $end_index" + + #local sketches=$(find $EXAMPLES_PATH -name *.ino) + local sketchnum=0 + print_size_info >size.log + for sketch in $sketches; do + local sketchdir=$(dirname $sketch) + local sketchdirname=$(basename $sketchdir) + local sketchname=$(basename $sketch) + if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then + #echo "Skipping $sketch, beacause it is not the main sketch file"; + continue + fi; + if [[ -f "$sketchdir/.test.skip" ]]; then + #echo "Skipping $sketch marked"; + continue + fi + sketchnum=$(($sketchnum + 1)) + if [ "$sketchnum" -le "$start_index" ]; then + #echo "Skipping $sketch index low" + continue + fi + if [ "$sketchnum" -gt "$end_index" ]; then + #echo "Skipping $sketch index high" + continue + fi + build_sketch $sketch + local result=$? + if [ $result -ne 0 ]; then + return $result + fi + print_size_info $EXAMPLES_BUILD_DIR/*.elf >>size.log + done + return 0 +} + +#count_sketches +build_sketches $CHUNK_INDEX $CHUNKS_CNT + +#export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin:$PATH" +#source tools/common.sh #build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries" if [ $? -ne 0 ]; then exit 1; fi From 7a3a47bb797dfef9c6d158f17fe85299721dc756 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Tue, 20 Aug 2019 12:23:24 +0300 Subject: [PATCH 12/16] fix names must not be the same --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ada058623d9..3952cf51713 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ on: [push] jobs: build-arduino-0: - name: Build Arduino IDE Tests + name: Build Arduino IDE Tests 0 runs-on: ubuntu-latest steps: @@ -29,7 +29,7 @@ jobs: run: cat size.log build-arduino-1: - name: Build Arduino IDE Tests + name: Build Arduino IDE Tests 1 runs-on: ubuntu-latest steps: From cc47d505f695a97baa5321dd992f7f7bd8280693 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Tue, 20 Aug 2019 12:54:13 +0300 Subject: [PATCH 13/16] 20 parallel jobs --- .github/workflows/main.yml | 378 ++++++++++++++++++++++++++++++++++++- 1 file changed, 376 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3952cf51713..d7e5d29f920 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 0 9 + run: ./tools/test-arduino-ide.sh 0 19 - name: Sketch Sizes run: cat size.log @@ -46,7 +46,381 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 1 9 + run: ./tools/test-arduino-ide.sh 1 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-2: + name: Build Arduino IDE Tests 2 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 2 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-3: + name: Build Arduino IDE Tests 3 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 3 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-4: + name: Build Arduino IDE Tests 4 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 4 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-5: + name: Build Arduino IDE Tests 5 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 5 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-6: + name: Build Arduino IDE Tests 6 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 6 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-7: + name: Build Arduino IDE Tests 7 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 7 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-8: + name: Build Arduino IDE Tests 8 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 8 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-9: + name: Build Arduino IDE Tests 9 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 9 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-10: + name: Build Arduino IDE Tests 10 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 10 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-11: + name: Build Arduino IDE Tests 11 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 11 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-12: + name: Build Arduino IDE Tests 12 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 12 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-13: + name: Build Arduino IDE Tests 13 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 13 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-14: + name: Build Arduino IDE Tests 14 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 14 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-15: + name: Build Arduino IDE Tests 15 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 15 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-16: + name: Build Arduino IDE Tests 16 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 16 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-17: + name: Build Arduino IDE Tests 17 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 17 19 + - name: Sketch Sizes + run: cat size.log + + build-arduino-18: + name: Build Arduino IDE Tests 18 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Pull submodules + run: git submodule update --init --recursive + - name: Run CMake Check + run: ./tools/check_cmakelists.sh + + - name: Install Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/prep-arduino-ide.sh + - name: Test Arduino IDE + env: + TRAVIS_BUILD_DIR: ${{ github.workspace }} + run: ./tools/test-arduino-ide.sh 18 19 - name: Sketch Sizes run: cat size.log From 3dc07673cc5fd82c79ab19b11d111b24631667f2 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Tue, 20 Aug 2019 13:30:58 +0300 Subject: [PATCH 14/16] 18 jobs and better math --- .github/workflows/main.yml | 58 ++++++++++++-------------------------- tools/test-arduino-ide.sh | 24 ++++++++++++---- 2 files changed, 36 insertions(+), 46 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d7e5d29f920..1960d552588 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 0 19 + run: ./tools/test-arduino-ide.sh 0 18 - name: Sketch Sizes run: cat size.log @@ -46,7 +46,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 1 19 + run: ./tools/test-arduino-ide.sh 1 18 - name: Sketch Sizes run: cat size.log @@ -68,7 +68,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 2 19 + run: ./tools/test-arduino-ide.sh 2 18 - name: Sketch Sizes run: cat size.log @@ -90,7 +90,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 3 19 + run: ./tools/test-arduino-ide.sh 3 18 - name: Sketch Sizes run: cat size.log @@ -112,7 +112,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 4 19 + run: ./tools/test-arduino-ide.sh 4 18 - name: Sketch Sizes run: cat size.log @@ -134,7 +134,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 5 19 + run: ./tools/test-arduino-ide.sh 5 18 - name: Sketch Sizes run: cat size.log @@ -156,7 +156,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 6 19 + run: ./tools/test-arduino-ide.sh 6 18 - name: Sketch Sizes run: cat size.log @@ -178,7 +178,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 7 19 + run: ./tools/test-arduino-ide.sh 7 18 - name: Sketch Sizes run: cat size.log @@ -200,7 +200,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 8 19 + run: ./tools/test-arduino-ide.sh 8 18 - name: Sketch Sizes run: cat size.log @@ -222,7 +222,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 9 19 + run: ./tools/test-arduino-ide.sh 9 18 - name: Sketch Sizes run: cat size.log @@ -244,7 +244,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 10 19 + run: ./tools/test-arduino-ide.sh 10 18 - name: Sketch Sizes run: cat size.log @@ -266,7 +266,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 11 19 + run: ./tools/test-arduino-ide.sh 11 18 - name: Sketch Sizes run: cat size.log @@ -288,7 +288,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 12 19 + run: ./tools/test-arduino-ide.sh 12 18 - name: Sketch Sizes run: cat size.log @@ -310,7 +310,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 13 19 + run: ./tools/test-arduino-ide.sh 13 18 - name: Sketch Sizes run: cat size.log @@ -332,7 +332,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 14 19 + run: ./tools/test-arduino-ide.sh 14 18 - name: Sketch Sizes run: cat size.log @@ -354,7 +354,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 15 19 + run: ./tools/test-arduino-ide.sh 15 18 - name: Sketch Sizes run: cat size.log @@ -376,7 +376,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 16 19 + run: ./tools/test-arduino-ide.sh 16 18 - name: Sketch Sizes run: cat size.log @@ -398,29 +398,7 @@ jobs: - name: Test Arduino IDE env: TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 17 19 - - name: Sketch Sizes - run: cat size.log - - build-arduino-18: - name: Build Arduino IDE Tests 18 - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - name: Pull submodules - run: git submodule update --init --recursive - - name: Run CMake Check - run: ./tools/check_cmakelists.sh - - - name: Install Arduino IDE - env: - TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/prep-arduino-ide.sh - - name: Test Arduino IDE - env: - TRAVIS_BUILD_DIR: ${{ github.workspace }} - run: ./tools/test-arduino-ide.sh 18 19 + run: ./tools/test-arduino-ide.sh 17 18 - name: Sketch Sizes run: cat size.log diff --git a/tools/test-arduino-ide.sh b/tools/test-arduino-ide.sh index c02242c2d42..f9268ec74b0 100755 --- a/tools/test-arduino-ide.sh +++ b/tools/test-arduino-ide.sh @@ -101,19 +101,31 @@ function build_sketches() count_sketches local sketchcount=$? local sketches=$(cat sketches.txt) - echo -e "Sketches: \n$sketches\n" - echo "Found $sketchcount Sketches"; - local chunk_size=$(( $(( $sketchcount / $chunks_num )) + 1 )) - echo "Chunk Size $chunk_size" + + local chunk_size=$(( $sketchcount / $chunks_num )) + local all_chunks=$(( $chunks_num * $chunk_size )) + if [ "$all_chunks" -lt "$sketchcount" ]; then + chunk_size=$(( $chunk_size + 1 )) + fi + local start_index=$(( $chunk_idex * $chunk_size )) - echo "Start $start_index" + if [ "$sketchcount" -le "$start_index" ]; then + echo "Skipping job" + return 0 + fi + local end_index=$(( $(( $chunk_idex + 1 )) * $chunk_size )) if [ "$end_index" -gt "$sketchcount" ]; then end_index=$sketchcount fi + + local start_num=$(( $start_index + 1 )) + #echo -e "Sketches: \n$sketches\n" + echo "Found $sketchcount Sketches"; + #echo "Chunk Size $chunk_size" + echo "Start $start_num" echo "End $end_index" - #local sketches=$(find $EXAMPLES_PATH -name *.ino) local sketchnum=0 print_size_info >size.log for sketch in $sketches; do From 32723bb1fb25d6198cc151c613f20d66b7a1e7f9 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Tue, 20 Aug 2019 13:55:00 +0300 Subject: [PATCH 15/16] Stop travis from building the tests --- tools/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build.sh b/tools/build.sh index 96bced008e1..d6637420279 100755 --- a/tools/build.sh +++ b/tools/build.sh @@ -3,7 +3,7 @@ if [ ! -z "$TRAVIS_TAG" ]; then # zip the package if tagged build tools/build-release.sh -a$ESP32_GITHUB_TOKEN -else +#else # run cmake and sketch tests - tools/check_cmakelists.sh && tools/build-tests.sh + #tools/check_cmakelists.sh && tools/build-tests.sh fi From 37cf89d5b4f58586a83280df521b63bc1541be4f Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Tue, 20 Aug 2019 15:21:58 +0300 Subject: [PATCH 16/16] run ci only on PRs and tidy code a bit --- .github/workflows/main.yml | 2 +- tools/build-tests.sh | 35 ++++++++++--------- tools/build.sh | 2 +- tools/common.sh | 70 -------------------------------------- tools/test-arduino-ide.sh | 16 +++------ 5 files changed, 25 insertions(+), 100 deletions(-) delete mode 100755 tools/common.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1960d552588..9c5e60b0f00 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ name: ESP32 Arduino CI -on: [push] +on: [pull_request] jobs: diff --git a/tools/build-tests.sh b/tools/build-tests.sh index 90d18c88da4..b60150681b0 100755 --- a/tools/build-tests.sh +++ b/tools/build-tests.sh @@ -1,32 +1,33 @@ #!/bin/bash -if [ ! -z "$TRAVIS_TAG" ]; then - echo "No sketch builds & tests required for tagged TravisCI builds, exiting" - exit 0 -fi - -echo -e "travis_fold:start:sketch_test_env_prepare" -tools/prep-arduino-ide.sh +# CMake Test +echo -e "travis_fold:start:check_cmakelists" +tools/check_cmakelists.sh if [ $? -ne 0 ]; then exit 1; fi -echo -e "travis_fold:end:sketch_test_env_prepare" +echo -e "travis_fold:end:check_cmakelists" -echo -e "travis_fold:start:platformio_test_env_prepare" -tools/prep-platformio.sh +# ArduinoIDE Test +echo -e "travis_fold:start:prep_arduino_ide" +tools/prep-arduino-ide.sh if [ $? -ne 0 ]; then exit 1; fi -echo -e "travis_fold:end:platformio_test_env_prepare" +echo -e "travis_fold:end:prep_arduino_ide" -cd $TRAVIS_BUILD_DIR - -echo -e "travis_fold:start:sketch_test" +echo -e "travis_fold:start:test_arduino_ide" tools/test-arduino-ide.sh if [ $? -ne 0 ]; then exit 1; fi -echo -e "travis_fold:end:sketch_test" +echo -e "travis_fold:end:test_arduino_ide" echo -e "travis_fold:start:size_report" cat size.log echo -e "travis_fold:end:size_report" -echo -e "travis_fold:start:platformio_test" +# PlatformIO Test +echo -e "travis_fold:start:prep_platformio" +tools/prep-platformio.sh +if [ $? -ne 0 ]; then exit 1; fi +echo -e "travis_fold:end:prep_platformio" + +echo -e "travis_fold:start:test_platformio" tools/test-platformio.sh if [ $? -ne 0 ]; then exit 1; fi -echo -e "travis_fold:end:platformio_test" +echo -e "travis_fold:end:test_platformio" diff --git a/tools/build.sh b/tools/build.sh index d6637420279..3b3ab40c242 100755 --- a/tools/build.sh +++ b/tools/build.sh @@ -5,5 +5,5 @@ if [ ! -z "$TRAVIS_TAG" ]; then tools/build-release.sh -a$ESP32_GITHUB_TOKEN #else # run cmake and sketch tests - #tools/check_cmakelists.sh && tools/build-tests.sh + #tools/build-tests.sh fi diff --git a/tools/common.sh b/tools/common.sh deleted file mode 100755 index b29202868c2..00000000000 --- a/tools/common.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env bash - -function print_size_info() -{ - elf_file=$1 - - if [ -z "$elf_file" ]; then - printf "sketch iram0.text flash.text flash.rodata dram0.data dram0.bss dram flash\n" - return 0 - fi - - elf_name=$(basename $elf_file) - sketch_name="${elf_name%.*}" - # echo $sketch_name - declare -A segments - while read -a tokens; do - seg=${tokens[0]} - seg=${seg//./} - size=${tokens[1]} - addr=${tokens[2]} - if [ "$addr" -eq "$addr" -a "$addr" -ne "0" ] 2>/dev/null; then - segments[$seg]=$size - fi - done < <(xtensa-esp32-elf-size --format=sysv $elf_file) - - total_ram=$((${segments[dram0data]} + ${segments[dram0bss]})) - total_flash=$((${segments[iram0text]} + ${segments[flashtext]} + ${segments[dram0data]} + ${segments[flashrodata]})) - printf "%-28s %-8d %-8d %-8d %-8d %-8d %-8d %-8d\n" $sketch_name ${segments[iram0text]} ${segments[flashtext]} ${segments[flashrodata]} ${segments[dram0data]} ${segments[dram0bss]} $total_ram $total_flash - return 0 -} - -function build_sketches() -{ - #set +e - local arduino=$1 - local srcpath=$2 - local build_arg=$3 - local build_dir=build.tmp - mkdir -p $build_dir - local build_cmd="python tools/build.py -b esp32 -v -k -p $PWD/$build_dir $build_arg " - local sketches=$(find $srcpath -name *.ino) - print_size_info >size.log - export ARDUINO_IDE_PATH=$arduino - for sketch in $sketches; do - rm -rf $build_dir/* - local sketchdir=$(dirname $sketch) - local sketchdirname=$(basename $sketchdir) - local sketchname=$(basename $sketch) - if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then - echo "Skipping $sketch, beacause it is not the main sketch file"; - continue - fi; - if [[ -f "$sketchdir/.test.skip" ]]; then - echo -e "\n ------------ Skipping $sketch ------------ \n"; - continue - fi - echo -e "\n ------------ Building $sketch ------------ \n"; - time ($build_cmd $sketch >build.log) - local result=$? - if [ $result -ne 0 ]; then - echo "Build failed ($1)" - echo "Build log:" - cat build.log - return $result - fi - rm build.log - print_size_info $build_dir/*.elf >>size.log - done - #set -e -} diff --git a/tools/test-arduino-ide.sh b/tools/test-arduino-ide.sh index f9268ec74b0..0b9e66abbfc 100755 --- a/tools/test-arduino-ide.sh +++ b/tools/test-arduino-ide.sh @@ -55,8 +55,7 @@ function print_size_info() function build_sketch() { local sketch=$1 - echo -e "\n ------------ Building $sketch ------------ \n"; - #return 0 #### + echo -e "\n------------ Building $sketch ------------\n"; rm -rf $EXAMPLES_BUILD_DIR/* time ($EXAMPLES_BUILD_CMD $sketch >build.log) local result=$? @@ -67,8 +66,6 @@ function build_sketch() return $result fi rm build.log - #print_size_info - #print_size_info $EXAMPLES_BUILD_DIR/*.elf return 0 } @@ -122,9 +119,10 @@ function build_sketches() local start_num=$(( $start_index + 1 )) #echo -e "Sketches: \n$sketches\n" echo "Found $sketchcount Sketches"; - #echo "Chunk Size $chunk_size" - echo "Start $start_num" - echo "End $end_index" + echo "Chunk Count : $chunks_num" + echo "Chunk Size : $chunk_size" + echo "Start Sketch: $start_num" + echo "End Sketch : $end_index" local sketchnum=0 print_size_info >size.log @@ -159,10 +157,6 @@ function build_sketches() return 0 } -#count_sketches build_sketches $CHUNK_INDEX $CHUNKS_CNT -#export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin:$PATH" -#source tools/common.sh -#build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries" if [ $? -ne 0 ]; then exit 1; fi