Migrate IDF to v5.2.3 (nanoframework#3036)

TerryFogg · Dec 3, 2024 · 137269e · 137269e
1 parent 9cf7e8f
commit 137269e
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
   },
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FROM ghcr.io/nanoframework/dev-container-all:v2.53
		FROM ghcr.io/nanoframework/dev-container-all:v2.54