Skip to content

Commit d919a78

Browse files
DatanoiseTVDatanoiseTV
authored andcommitted
CI: pin IDF docker to release-v6.0; use python -m esptool
Two changes that fall out of the same problem — the previous CI run failed with `esptool: not found` because the IDF v5.5 docker image bundles esptool.py (4.x) under the old binary name, while the workflow called it as `esptool` (5.x renamed binary). 1. Pin the docker image to espressif/idf:release-v6.0. That's the IDF version we develop and test against locally; matching it in CI removes a whole class of skew. v6.0 ships esptool 5.x with the `merge-bin` (hyphen) subcommand spelling. 2. Use `python -m esptool ...` for the merge step. Portable across IDF versions: works on 4.x and 5.x without caring about the binary name on PATH. Run that hit this: https://github.com/DatanoiseTV/esp-hosted-open/actions/runs/24939581629
1 parent f7e5f0e commit d919a78

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: build P4 host example (SDIO)
2020
runs-on: ubuntu-latest
2121
container:
22-
image: espressif/idf:release-v5.5
22+
image: espressif/idf:release-v6.0
2323
steps:
2424
- uses: actions/checkout@v4
2525
- name: idf.py build (esp32p4)
@@ -33,7 +33,7 @@ jobs:
3333
name: slave (${{ matrix.chip }})
3434
runs-on: ubuntu-latest
3535
container:
36-
image: espressif/idf:release-v5.5
36+
image: espressif/idf:release-v6.0
3737
strategy:
3838
fail-fast: false
3939
matrix:
@@ -73,7 +73,9 @@ jobs:
7373
working-directory: slave
7474
run: |
7575
. $IDF_PATH/export.sh
76-
esptool --chip ${{ matrix.chip }} merge-bin \
76+
# Use `python -m esptool`: portable across IDF v5.x (esptool.py 4.x)
77+
# and v6.x (esptool 5.x renamed binary).
78+
python -m esptool --chip ${{ matrix.chip }} merge-bin \
7779
-o build/${{ matrix.short }}_slave_merged.bin \
7880
--flash-mode dio --flash-size 4MB --flash-freq 80m \
7981
${{ matrix.merge_args }}

0 commit comments

Comments
 (0)