Skip to content

Commit d36f869

Browse files
authored
Merge pull request adafruit#11343 from MakerClassCZ/ci-espressif-ninja
ci: get ninja from the IDF tools instead of apt
2 parents eb49ac4 + be5162d commit d36f869

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

‎.github/actions/deps/external/action.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,11 @@ runs:
2929
release: '15.2.Rel1'
3030

3131
# espressif
32-
- name: Get espressif toolchain
33-
if: inputs.port == 'espressif'
34-
run: |
35-
sudo apt-get update
36-
sudo apt-get install -y ninja-build
37-
shell: bash
3832
- name: Install IDF tools
3933
if: inputs.port == 'espressif'
4034
run: |
4135
$IDF_PATH/install.sh
36+
$IDF_PATH/tools/idf_tools.py install ninja
4237
rm -rf $IDF_TOOLS_PATH/dist
4338
shell: bash
4439
- name: Set environment

‎.github/actions/deps/ports/espressif/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ runs:
3030
uses: actions/cache@v5
3131
with:
3232
path: ${{ env.IDF_TOOLS_PATH }}
33-
key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-idf-${{ steps.idf-commit.outputs.commit }}
33+
key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-idf-${{ steps.idf-commit.outputs.commit }}-20260911
3434

3535
- name: Initialize IDF submodules
3636
run: git submodule update --init --depth=1 --recursive $IDF_PATH

0 commit comments

Comments
 (0)