From fa6a438981645336a701925da7fecbfe4ea76ed7 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 10:43:02 -0400 Subject: [PATCH 01/13] add test build script... --- .travis.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..185a8f4 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,36 @@ +# .travis.yml for nina-fw +# adapted from https://github.com/igrr/esp32-cam-demo/blob/master/.travis.yml +sudo: false +language: bash +os: + - linux + +addons: + apt: + packages: + - gperf + - python + +before_install: + # Save path to the git respository + - PROJECT_PATH=$(pwd) + +install: + - mkdir -p ~/esp + - cd ~/esp + # Download binary toolchain for the ESP32 + - wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz + - tar -xzf xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz + # Make xtensa-esp32-elf available for all terminal sessions + - export PATH=$PATH:$HOME/esp/xtensa-esp32-elf/bin + # Get ESP-IDF v3.3 + - git clone --branch v3.3 --recursive https://github.com/espressif/esp-idf.git + # Set the path to ESP-IDF directory + - export IDF_PATH=~/esp/esp-idf + # Install Required Python Packages + - python -m pip install --user -r $IDF_PATH/requirements.txt + + +script: + - cd $PROJECT_PATH + - make firmware \ No newline at end of file From 16708753b49f18d565d00f24ee664cd9fe9996bb Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 10:47:37 -0400 Subject: [PATCH 02/13] add deployment, drop gperf, python3 --- .travis.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 185a8f4..9a02313 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,7 @@ os: addons: apt: packages: - - gperf - - python + - python3.6 before_install: # Save path to the git respository @@ -33,4 +32,12 @@ install: script: - cd $PROJECT_PATH - - make firmware \ No newline at end of file + - make firmware + +deploy: + provider: releases + api_key: "GITHUB OAUTH TOKEN" + file: "FILE TO UPLOAD" + skip_cleanup: true + on: + tags: true \ No newline at end of file From 613da21bb3879694e5bfd12863e6dd869bbb1100 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 10:50:21 -0400 Subject: [PATCH 03/13] bump esp toolchain version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a02313..63caaa5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,8 @@ install: - mkdir -p ~/esp - cd ~/esp # Download binary toolchain for the ESP32 - - wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz - - tar -xzf xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz + - wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz + - tar -xzf ~/Downloads/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz # Make xtensa-esp32-elf available for all terminal sessions - export PATH=$PATH:$HOME/esp/xtensa-esp32-elf/bin # Get ESP-IDF v3.3 From 497e8332c40ff870b5b5483ca39db916b1b88aff Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 10:50:54 -0400 Subject: [PATCH 04/13] py 3.5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 63caaa5..98d1014 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ os: addons: apt: packages: - - python3.6 + - python3.5 before_install: # Save path to the git respository From 9f02cb294b58582e442dbd63ad7ce3e3b5332871 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 11:04:45 -0400 Subject: [PATCH 05/13] fix untar location --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 98d1014..93e5ce2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ install: - cd ~/esp # Download binary toolchain for the ESP32 - wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz - - tar -xzf ~/Downloads/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz + - tar -xzf xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz # Make xtensa-esp32-elf available for all terminal sessions - export PATH=$PATH:$HOME/esp/xtensa-esp32-elf/bin # Get ESP-IDF v3.3 From 999710e92d2b5b94fdcc0fb13bb4fe4bd8632368 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 11:08:14 -0400 Subject: [PATCH 06/13] add gperf for cmake --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 93e5ce2..f40d112 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ addons: apt: packages: - python3.5 + - gperf before_install: # Save path to the git respository From 1c9a07eff43d484b8a17415271f32ff3eddb2a0d Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 11:13:56 -0400 Subject: [PATCH 07/13] update deployment script --- .travis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f40d112..98172d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,11 +34,14 @@ install: script: - cd $PROJECT_PATH - make firmware + - ls -la deploy: - provider: releases - api_key: "GITHUB OAUTH TOKEN" - file: "FILE TO UPLOAD" - skip_cleanup: true - on: - tags: true \ No newline at end of file + - provider: releases + api_key: "$GITHUB_TOKEN" + file_glob: true + file: "nina-fw.bin" + skip_cleanup: true + overwrite: true + on: + tags: true \ No newline at end of file From 6809f38aa895a734f02696bafe8c3483d6518367 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 11:18:34 -0400 Subject: [PATCH 08/13] deploy based on nina_102*.bin --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 98172d8..cbfe9fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ deploy: - provider: releases api_key: "$GITHUB_TOKEN" file_glob: true - file: "nina-fw.bin" + file: "NINA_W102-*.bin" skip_cleanup: true overwrite: true on: From 6ae580d917bfb09b0e8e7ceceee5a0e546252a3e Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 11:26:04 -0400 Subject: [PATCH 09/13] add travis badge --- .travis.yml | 1 - README.md | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cbfe9fa..094a32c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,6 @@ install: script: - cd $PROJECT_PATH - make firmware - - ls -la deploy: - provider: releases diff --git a/README.md b/README.md index 5a05d10..8199aaf 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Adafruit fork of the Arduino NINA-W102 firmware +[![Build Status](https://travis-ci.com/adafruit/nina-fw.svg?branch=master)](https://travis-ci.com/adafruit/nina-fw) + This is the Adafruit fork of the Arduino NINA-W102 firmware. The original repository is located at https://github.com/arduino/nina-fw From 1c72c5ae7141f498d2c31afee35631eeb6e266ab Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 11:31:13 -0400 Subject: [PATCH 10/13] reduce releases --- .travis.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 094a32c..96e256a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,11 +36,9 @@ script: - make firmware deploy: - - provider: releases - api_key: "$GITHUB_TOKEN" - file_glob: true - file: "NINA_W102-*.bin" - skip_cleanup: true - overwrite: true - on: - tags: true \ No newline at end of file + provider: releases + api_key: "$GITHUB_TOKEN" + file: "NINA_W102-*.bin" + skip_cleanup: true + on: + tags: true \ No newline at end of file From a4ac932c3fd6eac6ddd69aa2a8eebebca6d0364c Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 11:31:58 -0400 Subject: [PATCH 11/13] drop tag --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96e256a..3b430e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,4 @@ deploy: provider: releases api_key: "$GITHUB_TOKEN" file: "NINA_W102-*.bin" - skip_cleanup: true - on: - tags: true \ No newline at end of file + skip_cleanup: true \ No newline at end of file From 2390b882435d3da5ce64ac1f7900bab64459e9c7 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 11:48:28 -0400 Subject: [PATCH 12/13] deploy on tag releases --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3b430e4..96e256a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,4 +39,6 @@ deploy: provider: releases api_key: "$GITHUB_TOKEN" file: "NINA_W102-*.bin" - skip_cleanup: true \ No newline at end of file + skip_cleanup: true + on: + tags: true \ No newline at end of file From 22c0f001ee4426d10b2a251e641aec789e3be1e6 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 31 Oct 2019 11:59:37 -0400 Subject: [PATCH 13/13] enable file_glob for * pattern --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 96e256a..4b866fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ script: deploy: provider: releases api_key: "$GITHUB_TOKEN" + file_glob: true file: "NINA_W102-*.bin" skip_cleanup: true on: