Merge pull request #75 from tobozo/1.4.2

1.4.2

.github/workflows/ArduinoBuild.yml

@@ -11,6 +11,15 @@ on:
     - '**ArduinoBuild.yml'
   pull_request:
   workflow_dispatch:
+    inputs:
+      lgfx_branch:
+        description: 'LovyanGFX Base branch'
+        required: true
+        default: 'develop'
+        type: choice
+        options:
+        - master
+        - develop
 
 jobs:
 
@@ -90,7 +99,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: Lovyan03/LovyanGFX
-          ref: develop
+          ref: ${{ github.event.inputs.lgfx_branch }}
           path: CustomLGFX # must contain string "Custom"
 
       - name: ${{ matrix.board }}

.github/workflows/PlatformioBuild.yml

@@ -2,44 +2,91 @@ name: PlatformIOBuild
 
 env:
   PROJECT_DIR: examples/Tests/build_test
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 on:
   push:
     paths:
     - '**.ino'
+    - '**.ini'
     - '**.cpp'
     - '**.hpp'
     - '**.h'
     - '**.c'
     - '**PlatformioBuild.yml'
   pull_request:
   workflow_dispatch:
+    inputs:
+      master_branch:
+        description: 'Main branch'
+        required: true
+        type: environment
+        default: 'master'
 
 jobs:
   build:
-    name: ${{ matrix.pio-env }}
 
+    name: ${{ matrix.board }}@${{ matrix.platform-version }}
     runs-on: ubuntu-latest
 
     strategy:
+
       matrix:
 
-        pio-env:
+        # This matrix is highly dependant on platformio.ini contents
+        # It expects [env] values named after the board and the platform
+        # version e.g. [m5stack-fire@2.0.3-RC1] and trusts that env
+        # for loading the relevant platform version
+
+        platform-version:
+          - 1.0.6
+          - 2.0.0
+          - 2.0.1
+          - 2.0.2
+          - 2.0.3-RC1
+
+        board:
           - esp32
           - m5stick-c
           - m5stack-core-esp32
           - m5stack-fire
           - m5stack-core2
           - odroid_esp32
-          - esp32wroverkit
+          - esp-wrover-kit
           - esp32s3box
-          - d32_pro
-          - twatch
+          - lolin_d32_pro
+          - ttgo-t-watch
           - ttgo-t1
           #- ttgo-lora32-v2
 
-      fail-fast: false
+        exclude:
+          - { board: esp32s3box, platform-version: 1.0.6 }
+          - { board: esp32s3box, platform-version: 2.0.0 }
+          - { board: esp32s3box, platform-version: 2.0.1 }
+          - { board: esp32s3box, platform-version: 2.0.2 }
+#          - board: esp-wrover-kit
+#            platform-version: 1.0.6
 
+
+        include:
+          - platform-version: 1.0.6
+          - platform-version: 2.0.0
+          - platform-version: 2.0.1
+          - platform-version: 2.0.2
+          - platform-version: 2.0.3-RC1
+          - board: esp32
+          - board: m5stick-c
+          - board: m5stack-core-esp32
+          - board: m5stack-fire
+          - board: m5stack-core2
+          - board: odroid_esp32
+          - board: esp-wrover-kit
+          - board: esp32s3box
+          - board: lolin_d32_pro
+          - board: ttgo-t-watch
+          - board: ttgo-t1
+
+      fail-fast: false
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -65,9 +112,12 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade platformio
+#          pio upgrade --dev
 
       - name: Run PlatformIO
         run: |
-          mkdir -p /tmp/piolib
-          cp -R ../ESP32-Chimera-Core /tmp/piolib/
-          cd ${{ env.PROJECT_DIR }} && pio run -e ${{ matrix.pio-env }}
+          cd ${{ env.PROJECT_DIR }}
+          [[ "${{ env.BRANCH_NAME }}" == "${{ github.event.inputs.master_branch }}" ]] && rm dev_lib_deps.ini || echo "Develop!" && pio system prune -f
+          pio lib -e ${{ matrix.board }}@${{ matrix.platform-version }} install --no-save file://$(realpath ../../../)
+          pio run -e ${{ matrix.board }}@${{ matrix.platform-version }}
+

examples/Tests/build_test/dev_lib_deps.ini

@@ -0,0 +1,4 @@
+[lib_lgfx]
+lib_deps          =
+  git+https://github.com/lovyan03/LovyanGFX#develop
+  ESP32-Chimera-Core

examples/Tests/build_test/platformio.ini

@@ -1,59 +1,214 @@
 [platformio]
-default_envs = esp32
-src_dir = main
+default_envs      = esp32
+src_dir           = main
+extra_configs     = dev_lib_deps.ini
 
 [env]
-framework = arduino
-;platform = espressif32
-;platform = https://github.com/platformio/platform-espressif32.git
-platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
-platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.1
-; this assumes the CI has copied the library folder under this path
-; otherwise enable "ESP32-Chimera-Core" in "lib_deps"
-lib_extra_dirs =
-  /tmp/piolib
-lib_deps =
+framework         = arduino
+board             = esp32dev
+lib_ldf_mode      = deep
+build_type        = debug
+
+
+; Unless CI is running on master branch, this will be overriden by dev_lib_deps.ini contents
+[lib_lgfx]
+lib_deps          =
   LovyanGFX
-;  ESP32-Chimera-Core
+  ESP32-Chimera-Core
 
-build_type = debug
+[esp32_1_0_6]
+extends           = lib_lgfx
+platform          = espressif32 @ ^3
 
+[esp32_2_0_0]
+extends           = lib_lgfx
+platform          = espressif32 @ ^4
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.0
+; platform          = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
+; platform_packages =
+;   toolchain-xtensa32 @ ~2.80400.0
+;   framework-arduinoespressif32@https://github.com/espressif/arduino-esp32.git#2.0.0
 
-[env:esp32]
-board = esp32dev
+[esp32_2_0_1]
+extends           = lib_lgfx
+platform          = espressif32 @ ^4
+; platform          = https://github.com/tasmota/platform-espressif32
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.1
 
-[env:m5stick-c]
-board = m5stick-c
+[esp32_2_0_2]
+extends           = lib_lgfx
+platform          = https://github.com/tasmota/platform-espressif32
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.2
 
-[env:m5stack-core-esp32]
-board = m5stack-core-esp32
+[esp32_2_0_3]
+extends           = lib_lgfx
+platform          = https://github.com/tasmota/platform-espressif32
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3-RC1
 
-[env:m5stack-core2]
-board = m5stack-core2
 
-[env:m5stack-fire]
-board = m5stack-fire
+[esp32]
+board             = esp32dev
+[M5StickC]
+board             = m5stick-c
+[M5Stack]
+board             = m5stack-core-esp32
+[M5Core2]
+board             = m5stack-core2
+[M5Fire]
+board             = m5stack-fire
+[OdroidGo]
+board             = odroid_esp32
+[WroverKit]
+board             = esp-wrover-kit
+[D32Pro]
+board             = lolin_d32_pro
+[Twatch]
+board             = ttgo-t-watch
+[T1]
+board             = ttgo-t1
+[Lora32]
+board             = ttgo-lora32-v2
+[S3Box]
+board             = esp32dev
+board_build.mcu   = esp32s3
 
+; for some reason platformio 5.0 wants this
+[env:esp32]
+[env:m5stick-c]
+[env:m5stack-core-esp32]
+[env:m5stack-core2]
+[env:m5stack-fire]
 [env:odroid_esp32]
-board = odroid_esp32
+[env:esp-wrover-kit]
+[env:lolin_d32_pro]
+[env:ttgo-t-watch]
+[env:ttgo-t1]
+[env:ttgo-lora32-v2]
+[env:esp32s3box]
 
-[env:esp32wroverkit]
-board = esp-wrover-kit
 
-[env:d32_pro]
-board = lolin_d32_pro
+[env:esp32@1.0.6]
+extends           = esp32_1_0_6, esp32
+[env:esp32@2.0.0]
+extends           = esp32_2_0_0, esp32
+[env:esp32@2.0.1]
+extends           = esp32_2_0_1, esp32
+[env:esp32@2.0.2]
+extends           = esp32_2_0_2, esp32
+[env:esp32@2.0.3-RC1]
+extends           = esp32_2_0_3, esp32
 
-[env:twatch]
-board = ttgo-t-watch
+[env:m5stick-c@1.0.6]
+extends           = esp32_1_0_6, M5StickC
+[env:m5stick-c@2.0.0]
+extends           = esp32_2_0_0, M5StickC
+[env:m5stick-c@2.0.1]
+extends           = esp32_2_0_1, M5StickC
+[env:m5stick-c@2.0.2]
+extends           = esp32_2_0_2, M5StickC
+[env:m5stick-c@2.0.3-RC1]
+extends           = esp32_2_0_3, M5StickC
 
-[env:ttgo-t1]
-board = ttgo-t1
+[env:m5stack-core-esp32@1.0.6]
+extends           = esp32_1_0_6, M5Stack
+[env:m5stack-core-esp32@2.0.0]
+extends           = esp32_2_0_0, M5Stack
+[env:m5stack-core-esp32@2.0.1]
+extends           = esp32_2_0_1, M5Stack
+[env:m5stack-core-esp32@2.0.2]
+extends           = esp32_2_0_2, M5Stack
+[env:m5stack-core-esp32@2.0.3-RC1]
+extends           = esp32_2_0_3, M5Stack
 
-[env:ttgo-lora32-v2]
-board = ttgo-lora32-v2
+[env:m5stack-core2@1.0.6]
+extends           = esp32_1_0_6, M5Core2
+[env:m5stack-core2@2.0.0]
+extends           = esp32_2_0_0, M5Core2
+[env:m5stack-core2@2.0.1]
+extends           = esp32_2_0_1, M5Core2
+[env:m5stack-core2@2.0.2]
+extends           = esp32_2_0_2, M5Core2
+[env:m5stack-core2@2.0.3-RC1]
+extends           = esp32_2_0_3, M5Core2
+
+[env:m5stack-fire@1.0.6]
+extends           = esp32_1_0_6, M5Fire
+[env:m5stack-fire@2.0.0]
+extends           = esp32_2_0_0, M5Fire
+[env:m5stack-fire@2.0.1]
+extends           = esp32_2_0_1, M5Fire
+[env:m5stack-fire@2.0.2]
+extends           = esp32_2_0_2, M5Fire
+[env:m5stack-fire@2.0.3-RC1]
+extends           = esp32_2_0_3, M5Fire
+
+[env:odroid_esp32@1.0.6]
+extends           = esp32_1_0_6, OdroidGo
+[env:odroid_esp32@2.0.0]
+extends           = esp32_2_0_0, OdroidGo
+[env:odroid_esp32@2.0.1]
+extends           = esp32_2_0_1, OdroidGo
+[env:odroid_esp32@2.0.2]
+extends           = esp32_2_0_2, OdroidGo
+[env:odroid_esp32@2.0.3-RC1]
+extends           = esp32_2_0_3, OdroidGo
+
+[env:esp-wrover-kit@1.0.6]
+extends           = esp32_1_0_6, WroverKit
+[env:esp-wrover-kit@2.0.0]
+extends           = esp32_2_0_0, WroverKit
+[env:esp-wrover-kit@2.0.1]
+extends           = esp32_2_0_1, WroverKit
+[env:esp-wrover-kit@2.0.2]
+extends           = esp32_2_0_2, WroverKit
+[env:esp-wrover-kit@2.0.3-RC1]
+extends           = esp32_2_0_3, WroverKit
+
+[env:lolin_d32_pro@1.0.6]
+extends           = esp32_1_0_6, D32Pro
+[env:lolin_d32_pro@2.0.0]
+extends           = esp32_2_0_0, D32Pro
+[env:lolin_d32_pro@2.0.1]
+extends           = esp32_2_0_1, D32Pro
+[env:lolin_d32_pro@2.0.2]
+extends           = esp32_2_0_2, D32Pro
+[env:lolin_d32_pro@2.0.3-RC1]
+extends           = esp32_2_0_3, D32Pro
+
+[env:ttgo-t-watch@1.0.6]
+extends           = esp32_1_0_6, Twatch
+[env:ttgo-t-watch@2.0.0]
+extends           = esp32_2_0_0, Twatch
+[env:ttgo-t-watch@2.0.1]
+extends           = esp32_2_0_1, Twatch
+[env:ttgo-t-watch@2.0.2]
+extends           = esp32_2_0_2, Twatch
+[env:ttgo-t-watch@2.0.3-RC1]
+extends           = esp32_2_0_3, Twatch
+
+[env:ttgo-t1@1.0.6]
+extends           = esp32_1_0_6, T1
+[env:ttgo-t1@2.0.0]
+extends           = esp32_2_0_0, T1
+[env:ttgo-t1@2.0.1]
+extends           = esp32_2_0_1, T1
+[env:ttgo-t1@2.0.2]
+extends           = esp32_2_0_2, T1
+[env:ttgo-t1@2.0.3-RC1]
+extends           = esp32_2_0_3, T1
+
+[env:ttgo-lora32-v2@1.0.6]
+extends           = esp32_1_0_6, Lora32
+[env:ttgo-lora32-v2@2.0.0]
+extends           = esp32_2_0_0, Lora32
+[env:ttgo-lora32-v2@2.0.1]
+extends           = esp32_2_0_1, Lora32
+[env:ttgo-lora32-v2@2.0.2]
+extends           = esp32_2_0_2, Lora32
+[env:ttgo-lora32-v2@2.0.3-RC1]
+extends           = esp32_2_0_3, Lora32
+
+
+[env:esp32s3box@2.0.3-RC1]
+extends           = esp32_2_0_3, S3Box
 
-[env:esp32s3box]
-platform = https://github.com/tasmota/platform-espressif32
-platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3-RC1
-board = esp32dev
-board_build.mcu = esp32s3