Merge branch 'master' of https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA
This commit is contained in:
commit
bd555153e8
3 changed files with 9 additions and 8 deletions
|
@ -1,4 +1,4 @@
|
||||||
name: esp-idf with Adafruit GFX Library
|
name: esp-idf 5.1.2 with Adafruit GFX Library
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
@ -43,6 +43,6 @@ jobs:
|
||||||
- name: esp-idf build
|
- name: esp-idf build
|
||||||
uses: espressif/esp-idf-ci-action@v1
|
uses: espressif/esp-idf-ci-action@v1
|
||||||
with:
|
with:
|
||||||
esp_idf_version: v4.4.4
|
esp_idf_version: v5.1.2
|
||||||
target: esp32
|
target: esp32
|
||||||
path: 'examples/esp-idf/with-gfx'
|
path: 'examples/esp-idf/with-gfx'
|
|
@ -1,4 +1,4 @@
|
||||||
name: esp-idf without Adafruit GFX Library
|
name: esp-idf 5.1.2 without Adafruit GFX Library
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
@ -12,7 +12,7 @@ on:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: esp-idf without Adafruit GFX
|
name: esp-idf 5.1.2 without Adafruit GFX
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
@ -28,6 +28,6 @@ jobs:
|
||||||
- name: esp-idf build
|
- name: esp-idf build
|
||||||
uses: espressif/esp-idf-ci-action@v1
|
uses: espressif/esp-idf-ci-action@v1
|
||||||
with:
|
with:
|
||||||
esp_idf_version: v4.4
|
esp_idf_version: v5.1.2
|
||||||
target: esp32
|
target: esp32
|
||||||
path: 'examples/esp-idf/without-gfx'
|
path: 'examples/esp-idf/without-gfx'
|
|
@ -2,7 +2,7 @@
|
||||||
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
|
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
|
||||||
# https://docs.platformio.org/en/latest/integration/ci/github-actions.html
|
# https://docs.platformio.org/en/latest/integration/ci/github-actions.html
|
||||||
|
|
||||||
name: PlatformIO CI
|
name: PlatformIO 6.1.11 Arduino CI
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
@ -48,7 +48,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
python-version: '3.x'
|
python-version: '3.x'
|
||||||
- name: Install Platformio
|
- name: Install Platformio
|
||||||
run: pip install --upgrade platformio==6.1.6
|
run: pip install --upgrade platformio==6.1.11
|
||||||
- name: Run PlatformIO CI (Arduino)
|
- name: Run PlatformIO CI (Arduino)
|
||||||
if: ${{ matrix.framework == 'Arduino'}}
|
if: ${{ matrix.framework == 'Arduino'}}
|
||||||
env:
|
env:
|
||||||
|
@ -60,4 +60,5 @@ jobs:
|
||||||
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
|
||||||
run: pio run -d ${{ matrix.example }} -e esp32idf -c ${{ matrix.example }}/platformio.ini
|
#run: pio run -d ${{ matrix.example }} -e esp32idf -c ${{ matrix.example }}/platformio.ini
|
||||||
|
run: pio run -d ${{ matrix.example }}
|
Loading…
Reference in a new issue