From 137269e017757d9a7346c8a4494a3cee538a18e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Fri, 8 Nov 2024 11:51:20 +0000 Subject: [PATCH] Migrate IDF to v5.2.3 (#3036) --- .devcontainer/All/Dockerfile.All | 2 +- .devcontainer/All/Dockerfile.All.SRC | 2 +- .devcontainer/ESP32/Dockerfile.ESP32 | 2 +- .devcontainer/ESP32/Dockerfile.ESP32.SRC | 2 +- azure-pipelines-nightly.yml | 10 +++++----- .../build-espressif-esp32-targets.yml | 2 +- .../download-install-esp32-build-components.yml | 4 ++-- azure-pipelines.yml | 14 +++++++------- targets/ESP32/CMakeLists.txt | 14 ++++++++++---- version.json | 2 +- 10 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.devcontainer/All/Dockerfile.All b/.devcontainer/All/Dockerfile.All index 2eb757fc96..c916e6a413 100644 --- a/.devcontainer/All/Dockerfile.All +++ b/.devcontainer/All/Dockerfile.All @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-all:v2.53 +FROM ghcr.io/nanoframework/dev-container-all:v2.54 diff --git a/.devcontainer/All/Dockerfile.All.SRC b/.devcontainer/All/Dockerfile.All.SRC index c79e5da864..a4107b04ca 100644 --- a/.devcontainer/All/Dockerfile.All.SRC +++ b/.devcontainer/All/Dockerfile.All.SRC @@ -92,7 +92,7 @@ RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS- RUN git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip # Clone ESP-IDF -RUN git clone --branch v5.2.2 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf +RUN git clone --branch v5.2.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf # Clone what is needed for TI RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC32xx_SDK.git --depth 1 ./sources/SimpleLinkCC32 \ diff --git a/.devcontainer/ESP32/Dockerfile.ESP32 b/.devcontainer/ESP32/Dockerfile.ESP32 index 886deed093..7f556feeb2 100644 --- a/.devcontainer/ESP32/Dockerfile.ESP32 +++ b/.devcontainer/ESP32/Dockerfile.ESP32 @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-esp32:v2.33 +FROM ghcr.io/nanoframework/dev-container-esp32:v2.34 diff --git a/.devcontainer/ESP32/Dockerfile.ESP32.SRC b/.devcontainer/ESP32/Dockerfile.ESP32.SRC index ec5bbf8d05..6b45f70a80 100644 --- a/.devcontainer/ESP32/Dockerfile.ESP32.SRC +++ b/.devcontainer/ESP32/Dockerfile.ESP32.SRC @@ -48,7 +48,7 @@ RUN mkdir -p /usr/local/bin/gcc RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs # Clone ESP-IDF -RUN git clone --branch v5.2.2 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf +RUN git clone --branch v5.2.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf # Creating static link python for pyhton3 RUN ln -fs /usr/bin/python3 /usr/bin/python \ diff --git a/azure-pipelines-nightly.yml b/azure-pipelines-nightly.yml index 02ea88c3ab..211ea90d7f 100644 --- a/azure-pipelines-nightly.yml +++ b/azure-pipelines-nightly.yml @@ -17,7 +17,7 @@ resources: type: github name: espressif/esp-idf endpoint: nanoframework - ref: refs/tags/v5.2.2 + ref: refs/tags/v5.2.3 # scheduled build # the schedule is defined at the AZDO web interface because of inconsistencies with time zones @@ -294,7 +294,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('STM32_1_12_0_versioncounter', 0)] + REVISION: $[counter('STM32_1_12_1_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "stm32" @@ -545,7 +545,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('ESP32_1_12_0_versioncounter', 0)] + REVISION: $[counter('ESP32_1_12_1_versioncounter', 0)] IDF_PATH: "D:/a/1/s/esp-idf" PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip TargetPlatform: "esp32" @@ -621,7 +621,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('TI_1_12_0_versioncounter', 0)] + REVISION: $[counter('TI_1_12_1_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "ti_simplelink" @@ -672,7 +672,7 @@ jobs: variables: # creates a counter and assigns it to the revision variable - REVISION: $[counter('AZURERTOS_1_12_0_versioncounter', 0)] + REVISION: $[counter('AZURERTOS_1_12_1_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "azure_rtos" diff --git a/azure-pipelines-templates/build-espressif-esp32-targets.yml b/azure-pipelines-templates/build-espressif-esp32-targets.yml index f90bac9940..d7f9239d47 100644 --- a/azure-pipelines-templates/build-espressif-esp32-targets.yml +++ b/azure-pipelines-templates/build-espressif-esp32-targets.yml @@ -17,7 +17,7 @@ steps: - task: Cache@2 displayName: Cache IDF components inputs: - key: 'esp-idf-components-cache | 5_2_2' + key: 'esp-idf-components-cache | 5_2_3' path: $(Agent.BuildDirectory)/s/esp-idf/components cacheHitVar: ESP32_COMPONENTS_RESTORED diff --git a/azure-pipelines-templates/download-install-esp32-build-components.yml b/azure-pipelines-templates/download-install-esp32-build-components.yml index 3dcc49d697..f9609a10a0 100644 --- a/azure-pipelines-templates/download-install-esp32-build-components.yml +++ b/azure-pipelines-templates/download-install-esp32-build-components.yml @@ -6,8 +6,8 @@ steps: - task: Cache@2 displayName: Cache ESP32 tools inputs: - key: "esp32_tools | 5_2_2" - restoreKeys: 5_2_2 + key: "esp32_tools | 5_2_3" + restoreKeys: 5_2_3 path: $(UserProfile)\.espressif\tools cacheHitVar: ESP32_TOOLS_CACHE_RESTORED diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d73bde0450..cc77f5582b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -48,7 +48,7 @@ resources: type: github name: espressif/esp-idf endpoint: nanoframework - ref: 'refs/tags/v5.2.2' + ref: 'refs/tags/v5.2.3' - repository: mscorlib type: github name: nanoframework/CoreLibrary @@ -412,7 +412,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('STM32_1_12_0_versioncounter', 0)] + REVISION: $[counter('STM32_1_12_1_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "stm32" @@ -562,7 +562,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('ESP32_1_12_0_versioncounter', 0)] + REVISION: $[counter('ESP32_1_12_1_versioncounter', 0)] IDF_PATH: "D:/a/1/s/esp-idf" PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip TargetPlatform: "esp32" @@ -643,7 +643,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('NXP_1_12_0_versioncounter', 0)] + REVISION: $[counter('NXP_1_12_1_versioncounter', 0)] GIT_LFS_SKIP_SMUDGE: 1 TargetPlatform: "freertos" @@ -721,7 +721,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('TI_1_12_0_versioncounter', 0)] + REVISION: $[counter('TI_1_12_1_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "ti_simplelink" @@ -792,7 +792,7 @@ jobs: variables: # creates a counter and assigns it to the revision variable - REVISION: $[counter('AZURERTOS_1_12_0_versioncounter', 0)] + REVISION: $[counter('AZURERTOS_1_12_1_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "azure_rtos" @@ -843,7 +843,7 @@ jobs: value: true # creates a counter and assigns it to the revision variable - name: REVISION - value: $[counter('WIN32_1_12_0_versioncounter', 0)] + value: $[counter('WIN32_1_12_1_versioncounter', 0)] - name: LITTLEFS_PATH value: "D:/a/1/s/littlefs" diff --git a/targets/ESP32/CMakeLists.txt b/targets/ESP32/CMakeLists.txt index 632946f7fb..4e625c3f81 100644 --- a/targets/ESP32/CMakeLists.txt +++ b/targets/ESP32/CMakeLists.txt @@ -57,10 +57,16 @@ if(ESP32_IDF_PATH) endif() endif() -# WHEN CHANGING THIS MAKE SURE TO UPDATE: -# 1. the dev containers -# 2. ref in AZDO pipeline yaml in Community Targets repo -set(ESP32_IDF_TAG "5.2.2" CACHE INTERNAL "ESP32 IDF tag") +################################################################################# +# WHEN CHANGING THIS MAKE SURE TO UPDATE: # +# 1. the github tags in dev containers SRC # +# 2. ref in AZDO pipeline yaml (main, nightly build and Community Targets repo) # +# 3. cache tag in build and download AZDO yaml templates # +################################################################################# +################################################################################# +set(ESP32_IDF_TAG "5.2.3" CACHE INTERNAL "ESP32 IDF tag") +################################################################################# +################################################################################# if(NO_ESP32_IDF_PATH) # no ESP32 IDF source specified, download it from official repo diff --git a/version.json b/version.json index 8a224cd76b..c554033b14 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.12.0", + "version": "1.12.1", "assemblyVersion": { "precision": "revision" },