A bit of cleanup and re-ordering

This commit is contained in:
Elliot Matson 2023-01-29 22:02:30 -06:00
parent fda92b77af
commit a85b0e649f
2 changed files with 5 additions and 16 deletions

View file

@ -14,16 +14,15 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
continue-on-error: true
strategy: strategy:
matrix: matrix:
example: framework: ["Arduino", "IDF"]
- "examples/PIO_TestPatterns"
no_gfx: ["", -DNO_GFX] no_gfx: ["", -DNO_GFX]
no_fast_functions: ["", -DNO_FAST_FUNCTIONS] no_fast_functions: ["", -DNO_FAST_FUNCTIONS]
no_cie1931: ["", -DNO_CIE1931] no_cie1931: ["", -DNO_CIE1931]
virtual_panel: ["", -DVIRTUAL_PANE] virtual_panel: ["", -DVIRTUAL_PANE]
idf: [true, false] example:
- "examples/PIO_TestPatterns"
exclude: exclude:
- no_fast_functions: "" - no_fast_functions: ""
virtual_panel: -DVIRTUAL_PANE virtual_panel: -DVIRTUAL_PANE
@ -45,13 +44,13 @@ jobs:
- name: Install Platformio - name: Install Platformio
run: pip install --upgrade platformio run: pip install --upgrade platformio
- name: Run PlatformIO CI (Arduino) - name: Run PlatformIO CI (Arduino)
if: ${{ !matrix.idf}} if: ${{ matrix.framework == 'Arduino'}}
env: env:
PLATFORMIO_BUILD_FLAGS: ${{ matrix.no_gfx }} ${{ matrix.no_fast_functions }} ${{ matrix.no_cie1931 }} ${{ matrix.virtual_panel }} PLATFORMIO_BUILD_FLAGS: ${{ matrix.no_gfx }} ${{ matrix.no_fast_functions }} ${{ matrix.no_cie1931 }} ${{ matrix.virtual_panel }}
PLATFORMIO_CI_SRC: ${{ matrix.example }} PLATFORMIO_CI_SRC: ${{ matrix.example }}
run: pio ci -e esp32 -c ${{ matrix.example }}/platformio.ini run: pio ci -e esp32 -c ${{ matrix.example }}/platformio.ini
- name: Run PlatformIO CI (ESP-IDF) - name: Run PlatformIO CI (ESP-IDF)
if: ${{ matrix.idf }} if: ${{ matrix.framework == 'IDF'}}
env: env:
PLATFORMIO_BUILD_FLAGS: -DIDF_BUILD ${{ matrix.no_gfx }} ${{ matrix.no_fast_functions }} ${{ matrix.no_cie1931 }} ${{ matrix.virtual_panel }} 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 # pio ci doesn't use our sdkconfig, so we have to use pio run

View file

@ -19,15 +19,5 @@ monitor_filters = esp32_exception_decoder
[env:esp32] [env:esp32]
framework = arduino framework = arduino
; PIO CI can't handle IDF git modules properly (yet)
[env:esp32idf] [env:esp32idf]
;platform_packages =
; ; use a special branch
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.4
framework = arduino, espidf framework = arduino, espidf
;build_flags =
; ${env.build_flags}
; -DARDUINO=200
; -DESP32
; ;-DUSE_FASTLINES
; -DNO_GFX