From 21b3d92fff6b4dfba759a0ae96474a5f3d4f0ccb Mon Sep 17 00:00:00 2001 From: tobozo Date: Thu, 14 Nov 2024 14:47:21 +0100 Subject: [PATCH] esp-idf v5.4 test --- .github/scripts/esp-idf-versions.php | 4 ++-- .github/workflows/IDFBuild.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/esp-idf-versions.php b/.github/scripts/esp-idf-versions.php index 8c537ebe..ed053677 100644 --- a/.github/scripts/esp-idf-versions.php +++ b/.github/scripts/esp-idf-versions.php @@ -33,7 +33,7 @@ */ // hardcoded EOL versions, official versions will be added by the script -$hardcoded_fqbns = ['esp32@4.3.6', 'esp32@4.1.4', 'esp32s3@release/v5.4']; +$hardcoded_fqbns = ['esp32@v4.3.6', 'esp32@v4.1.4', 'esp32s3@release/v5.4']; // restrict output to these idf targets, other targets will be ignored $idf_boards = ['esp32', 'esp32s2', 'esp32s3', 'esp32c6'/*, 'esp32h2', 'esp32p4', 'esp32c5'*/]; @@ -64,7 +64,7 @@ if(in_array($board, $idf_boards)) // only keep supported targets { // e.g. esp32@5.2.1 - $fqbns[] = $board.'@'.str_replace(["v","V"], "", $version['name']); + $fqbns[] = $board.'@v'.str_replace(["v","V"], "", $version['name']); } } diff --git a/.github/workflows/IDFBuild.yml b/.github/workflows/IDFBuild.yml index f87b3488..532dd14c 100644 --- a/.github/workflows/IDFBuild.yml +++ b/.github/workflows/IDFBuild.yml @@ -95,7 +95,7 @@ jobs: cd ~/esp idf_fqbn="${{ matrix.esp-idf-fqbn }}" idf_version=${idf_fqbn#*@} - if [ ! -d "./esp-idf/" ]; then git clone -b v$idf_version --recursive ${{ needs.set_matrix.outputs.repo_url }} esp-idf; fi + if [ ! -d "./esp-idf/" ]; then git clone -b $idf_version --recursive ${{ needs.set_matrix.outputs.repo_url }} esp-idf; fi cd ~/esp/esp-idf if [ ! -d "~/.espressif" ]; then ./install.sh; fi