Skip to content

Commit

Permalink
CI: update esp-idf build versions
Browse files Browse the repository at this point in the history
Use latest released versions: v4.4.6, v5.0.4, v5.1.1.

Patches no longer need, included in upstream releases.

Signed-off-by: Peter M <petermm@gmail.com>
  • Loading branch information
petermm committed Oct 9, 2023
1 parent 3ce9b25 commit 59f0999
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 185 deletions.
26 changes: 4 additions & 22 deletions .github/workflows/esp32-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:

matrix:
idf-version:
- '4.4.5'
- '5.0.3'
- '5.1'
- '4.4.6'
- '5.0.4'
- '5.1.1'

steps:
- name: Checkout repo
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
gcc g++ zlib1g-dev
- name: Install qemu binary from espressif/qemu
if: matrix.idf-version != '5.1'
if: matrix.idf-version != '5.1.1'
run: |
set -eu
QEMU_VER=esp-develop-20220919
Expand All @@ -88,24 +88,6 @@ jobs:
pytest-embedded-idf==1.2.5 \
pytest-embedded-qemu==1.2.5
- name: Patch esp-idf 4.4.5 to fix race condition that affects qemu under heavy load
working-directory: ./src/platforms/esp32/test/
if: matrix.idf-version == '4.4.5'
run: |
set -e
PATCH=$PWD/esp_ipc_isr.patch
cd $IDF_PATH
patch -p1 < $PATCH
- name: Patch esp-idf 5.1 to fix race condition that affects qemu under heavy load
working-directory: ./src/platforms/esp32/test/
if: matrix.idf-version == '5.1'
run: |
set -e
PATCH=$PWD/esp_ipc_isr_5.1.patch
cd $IDF_PATH
patch -p1 < $PATCH
- name: Build ESP32 tests using idf.py
working-directory: ./src/platforms/esp32/test/
run: |
Expand Down
98 changes: 0 additions & 98 deletions src/platforms/esp32/test/esp_ipc_isr.patch

This file was deleted.

65 changes: 0 additions & 65 deletions src/platforms/esp32/test/esp_ipc_isr_5.1.patch

This file was deleted.

0 comments on commit 59f0999

Please sign in to comment.