From e8ea6f80e99b2c53a00d19edd649220d73eab1bb Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 7 Dec 2023 16:58:42 -0500 Subject: [PATCH 1/6] install and unzip --- .github/workflows/build-clang-doxy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 03d27122f..eb22be7b2 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -51,6 +51,11 @@ jobs: git clone --quiet https://github.com/adafruit/Adafruit_TouchScreen.git /home/runner/Arduino/libraries/Adafruit_TouchScreen git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library + - name: Download and install stable Nanopb + run: | + wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz + tar -xvf nanopb-0.4.8.tar.gz + ls - name: List all files in Adafruit_LittlevGL_Glue_Library folder run: | ls /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library From a0272e96a1ed60a03fc8361ff37d975bf8dcc79a Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 7 Dec 2023 17:08:47 -0500 Subject: [PATCH 2/6] check where ws is --- .github/workflows/build-clang-doxy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index eb22be7b2..dcd835c27 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -55,7 +55,8 @@ jobs: run: | wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz tar -xvf nanopb-0.4.8.tar.gz - ls + ls /home/runner/work/Adafruit_Wippersnapper_Arduino/Adafruit_Wippersnapper_Arduino + ls /home/runner/work/Adafruit_Wippersnapper_Arduino/ - name: List all files in Adafruit_LittlevGL_Glue_Library folder run: | ls /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library From 8d8d386ef73b962afe16392cea10cc10d0b8fa45 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 7 Dec 2023 17:14:57 -0500 Subject: [PATCH 3/6] move and copy, rename pb.h --- .github/workflows/build-clang-doxy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index dcd835c27..fdb41706d 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -55,8 +55,10 @@ jobs: run: | wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz tar -xvf nanopb-0.4.8.tar.gz - ls /home/runner/work/Adafruit_Wippersnapper_Arduino/Adafruit_Wippersnapper_Arduino - ls /home/runner/work/Adafruit_Wippersnapper_Arduino/ + cp nanopb-0.4.8/pb_encode.* src/nanopb + cp nanopb-0.4.8/pb_decode.* src/nanopb + cp nanopb-0.4.8/pb_common.* src/nanopb + cp nanopb-0.4.8/pb.h src/nanopb/nanopb.pb.h - name: List all files in Adafruit_LittlevGL_Glue_Library folder run: | ls /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library From a53399581825a03e3b84127212ce0513bd407ff9 Mon Sep 17 00:00:00 2001 From: Brent Rubell Date: Thu, 7 Dec 2023 17:22:32 -0500 Subject: [PATCH 4/6] use nanopb dir --- .github/workflows/build-clang-doxy.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index fdb41706d..80f3e7705 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -54,11 +54,11 @@ jobs: - name: Download and install stable Nanopb run: | wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz - tar -xvf nanopb-0.4.8.tar.gz - cp nanopb-0.4.8/pb_encode.* src/nanopb - cp nanopb-0.4.8/pb_decode.* src/nanopb - cp nanopb-0.4.8/pb_common.* src/nanopb - cp nanopb-0.4.8/pb.h src/nanopb/nanopb.pb.h + tar -xf nanopb-0.4.8.tar.gz + cp nanopb/pb_encode.* src/nanopb + cp nanopb/pb_decode.* src/nanopb + cp nanopb/pb_common.* src/nanopb + cp nanopb/pb.h src/nanopb/nanopb.pb.h - name: List all files in Adafruit_LittlevGL_Glue_Library folder run: | ls /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library From 91191508bbe6568da84c1a6dce0bfbe9700c7745 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 7 Dec 2023 17:27:00 -0500 Subject: [PATCH 5/6] switch to mv and multi-dir copy --- .github/workflows/build-clang-doxy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 80f3e7705..6ddf7e86d 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -53,12 +53,12 @@ jobs: git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library - name: Download and install stable Nanopb run: | + # Download and extract nanopb wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz tar -xf nanopb-0.4.8.tar.gz - cp nanopb/pb_encode.* src/nanopb - cp nanopb/pb_decode.* src/nanopb - cp nanopb/pb_common.* src/nanopb - cp nanopb/pb.h src/nanopb/nanopb.pb.h + # Copy files to WipperSnapper's src/nanopb directory + cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb + mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: List all files in Adafruit_LittlevGL_Glue_Library folder run: | ls /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library From 8423dbc0c6fb7953c517e3256925bb271f3767d4 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 7 Dec 2023 17:37:54 -0500 Subject: [PATCH 6/6] apply nanopb step across all targets --- .github/workflows/build-clang-doxy.yml | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 6ddf7e86d..414665308 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -119,6 +119,14 @@ jobs: run: | git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg + - name: Download and install stable Nanopb + run: | + # Download and extract nanopb + wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz + tar -xf nanopb-0.4.8.tar.gz + # Copy files to WipperSnapper's src/nanopb directory + cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb + mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: Install Dependencies run: | pip3 install esptool @@ -207,6 +215,14 @@ jobs: git clone --quiet https://github.com/adafruit/WiFiNINA.git /home/runner/Arduino/libraries/WiFiNINA git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire + - name: Download and install stable Nanopb + run: | + # Download and extract nanopb + wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz + tar -xf nanopb-0.4.8.tar.gz + # Copy files to WipperSnapper's src/nanopb directory + cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb + mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: build platforms run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: Rename build artifacts to reflect the platform name @@ -249,6 +265,14 @@ jobs: run: | git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg git clone --quiet https://github.com/pstolarz/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library + - name: Download and install stable Nanopb + run: | + # Download and extract nanopb + wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz + tar -xf nanopb-0.4.8.tar.gz + # Copy files to WipperSnapper's src/nanopb directory + cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb + mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: build platforms run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: Rename build artifacts to reflect the platform name @@ -292,6 +316,14 @@ jobs: git clone --quiet https://github.com/arduino-libraries/Servo.git /home/runner/Arduino/libraries/Servo git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire + - name: Download and install stable Nanopb + run: | + # Download and extract nanopb + wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz + tar -xf nanopb-0.4.8.tar.gz + # Copy files to WipperSnapper's src/nanopb directory + cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb + mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: build platforms run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 @@ -322,6 +354,14 @@ jobs: run: | git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire + - name: Download and install stable Nanopb + run: | + # Download and extract nanopb + wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz + tar -xf nanopb-0.4.8.tar.gz + # Copy files to WipperSnapper's src/nanopb directory + cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb + mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: build platforms run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: list build artifacts @@ -380,6 +420,14 @@ jobs: git clone --quiet https://github.com/adafruit/Adafruit_TouchScreen.git /home/runner/Arduino/libraries/Adafruit_TouchScreen git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library + - name: Download and install stable Nanopb + run: | + # Download and extract nanopb + wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz + tar -xf nanopb-0.4.8.tar.gz + # Copy files to WipperSnapper's src/nanopb directory + cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb + mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: List all files in Adafruit_LittlevGL_Glue_Library folder run: | ls /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library