diff options
| author | Elliot Matson <ematson5897@gmail.com> | 2023-01-29 22:02:30 -0600 |
|---|---|---|
| committer | Elliot Matson <ematson5897@gmail.com> | 2023-01-29 22:02:30 -0600 |
| commit | a85b0e649ffa9da618b1610cecd212b72800d3bc (patch) | |
| tree | 53262e461af9c7f2279c721329c343c43246c1ed | |
| parent | fda92b77af1a341c8f55ee04100b099222cb898a (diff) | |
A bit of cleanup and re-ordering
| -rw-r--r-- | .github/workflows/pio_build.yml | 11 | ||||
| -rw-r--r-- | examples/PIO_TestPatterns/platformio.ini | 10 |
2 files changed, 5 insertions, 16 deletions
diff --git a/.github/workflows/pio_build.yml b/.github/workflows/pio_build.yml index af4cb29..d64bda4 100644 --- a/.github/workflows/pio_build.yml +++ b/.github/workflows/pio_build.yml @@ -14,16 +14,15 @@ jobs: build: runs-on: ubuntu-latest - continue-on-error: true strategy: matrix: - example: - - "examples/PIO_TestPatterns" + framework: ["Arduino", "IDF"] no_gfx: ["", -DNO_GFX] no_fast_functions: ["", -DNO_FAST_FUNCTIONS] no_cie1931: ["", -DNO_CIE1931] virtual_panel: ["", -DVIRTUAL_PANE] - idf: [true, false] + example: + - "examples/PIO_TestPatterns" exclude: - no_fast_functions: "" virtual_panel: -DVIRTUAL_PANE @@ -45,13 +44,13 @@ jobs: - name: Install Platformio run: pip install --upgrade platformio - name: Run PlatformIO CI (Arduino) - if: ${{ !matrix.idf}} + if: ${{ matrix.framework == 'Arduino'}} env: PLATFORMIO_BUILD_FLAGS: ${{ matrix.no_gfx }} ${{ matrix.no_fast_functions }} ${{ matrix.no_cie1931 }} ${{ matrix.virtual_panel }} PLATFORMIO_CI_SRC: ${{ matrix.example }} run: pio ci -e esp32 -c ${{ matrix.example }}/platformio.ini - name: Run PlatformIO CI (ESP-IDF) - if: ${{ matrix.idf }} + if: ${{ matrix.framework == 'IDF'}} env: PLATFORMIO_BUILD_FLAGS: -DIDF_BUILD ${{ matrix.no_gfx }} ${{ matrix.no_fast_functions }} ${{ matrix.no_cie1931 }} ${{ matrix.virtual_panel }} # pio ci doesn't use our sdkconfig, so we have to use pio run diff --git a/examples/PIO_TestPatterns/platformio.ini b/examples/PIO_TestPatterns/platformio.ini index 6d154a2..185513a 100644 --- a/examples/PIO_TestPatterns/platformio.ini +++ b/examples/PIO_TestPatterns/platformio.ini @@ -19,15 +19,5 @@ monitor_filters = esp32_exception_decoder [env:esp32] framework = arduino -; PIO CI can't handle IDF git modules properly (yet) [env:esp32idf] -;platform_packages = -; ; use a special branch -; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.4 framework = arduino, espidf -;build_flags = -; ${env.build_flags} -; -DARDUINO=200 -; -DESP32 -; ;-DUSE_FASTLINES -; -DNO_GFX |