diff options
| author | mrfaptastic <12006953+mrfaptastic@users.noreply.github.com> | 2023-11-27 03:26:43 +0000 |
|---|---|---|
| committer | mrfaptastic <12006953+mrfaptastic@users.noreply.github.com> | 2023-11-27 03:26:43 +0000 |
| commit | bd555153e816c4fcaf865e6de463deec83242428 (patch) | |
| tree | 3cbef6dd4211f21c9fcb0af1e24891f49677676b | |
| parent | ad5e2338d09b236519b8b7b231e145da9c0fed87 (diff) | |
| parent | 17293b986b495ab300b806be756eae9e8616fe0f (diff) | |
Merge branch 'master' of https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA
| -rw-r--r-- | .github/workflows/esp-idf-5.1.2_with-gfx.yml (renamed from .github/workflows/esp-idf_with-gfx.yml) | 4 | ||||
| -rw-r--r-- | .github/workflows/esp-idf-5.1.2_without-gfx.yml (renamed from .github/workflows/esp-idf_without-gfx.yml) | 6 | ||||
| -rw-r--r-- | .github/workflows/pio_arduino_build.yml (renamed from .github/workflows/pio_build.yml) | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/.github/workflows/esp-idf_with-gfx.yml b/.github/workflows/esp-idf-5.1.2_with-gfx.yml index 20a6af3..07b8ddc 100644 --- a/.github/workflows/esp-idf_with-gfx.yml +++ b/.github/workflows/esp-idf-5.1.2_with-gfx.yml @@ -1,4 +1,4 @@ -name: esp-idf with Adafruit GFX Library +name: esp-idf 5.1.2 with Adafruit GFX Library on: push: @@ -43,6 +43,6 @@ jobs: - name: esp-idf build uses: espressif/esp-idf-ci-action@v1 with: - esp_idf_version: v4.4.4 + esp_idf_version: v5.1.2 target: esp32 path: 'examples/esp-idf/with-gfx' diff --git a/.github/workflows/esp-idf_without-gfx.yml b/.github/workflows/esp-idf-5.1.2_without-gfx.yml index 1038a65..d5137f1 100644 --- a/.github/workflows/esp-idf_without-gfx.yml +++ b/.github/workflows/esp-idf-5.1.2_without-gfx.yml @@ -1,4 +1,4 @@ -name: esp-idf without Adafruit GFX Library +name: esp-idf 5.1.2 without Adafruit GFX Library on: push: @@ -12,7 +12,7 @@ on: jobs: build: - name: esp-idf without Adafruit GFX + name: esp-idf 5.1.2 without Adafruit GFX runs-on: ubuntu-latest @@ -28,6 +28,6 @@ jobs: - name: esp-idf build uses: espressif/esp-idf-ci-action@v1 with: - esp_idf_version: v4.4 + esp_idf_version: v5.1.2 target: esp32 path: 'examples/esp-idf/without-gfx' diff --git a/.github/workflows/pio_build.yml b/.github/workflows/pio_arduino_build.yml index 3d2d91d..440117a 100644 --- a/.github/workflows/pio_build.yml +++ b/.github/workflows/pio_arduino_build.yml @@ -2,7 +2,7 @@ # 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 -name: PlatformIO CI +name: PlatformIO 6.1.11 Arduino CI on: push: @@ -48,7 +48,7 @@ jobs: with: python-version: '3.x' - name: Install Platformio - run: pip install --upgrade platformio==6.1.6 + run: pip install --upgrade platformio==6.1.11 - name: Run PlatformIO CI (Arduino) if: ${{ matrix.framework == 'Arduino'}} env: @@ -60,4 +60,5 @@ jobs: 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 - 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 }} |