Skip to content

Commit 4e44667

Browse files
josesimoesjosesimoes
authored
Migrate IDF to v5.2.3 (#3036)
1 parent fa6255f commit 4e44667

10 files changed

+30
-24
lines changed

‎.devcontainer/All/Dockerfile.All

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-all:v2.53
1+
FROM ghcr.io/nanoframework/dev-container-all:v2.54

‎.devcontainer/All/Dockerfile.All.SRC

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-
9292
RUN git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
9393

9494
# Clone ESP-IDF
95-
RUN git clone --branch v5.2.2 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
95+
RUN git clone --branch v5.2.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
9696

9797
# Clone what is needed for TI
9898
RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC32xx_SDK.git --depth 1 ./sources/SimpleLinkCC32 \

‎.devcontainer/ESP32/Dockerfile.ESP32

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-esp32:v2.33
1+
FROM ghcr.io/nanoframework/dev-container-esp32:v2.34

‎.devcontainer/ESP32/Dockerfile.ESP32.SRC

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RUN mkdir -p /usr/local/bin/gcc
4848
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
4949

5050
# Clone ESP-IDF
51-
RUN git clone --branch v5.2.2 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
51+
RUN git clone --branch v5.2.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
5252

5353
# Creating static link python for pyhton3
5454
RUN ln -fs /usr/bin/python3 /usr/bin/python \

‎azure-pipelines-nightly.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ resources:
1717
type: github
1818
name: espressif/esp-idf
1919
endpoint: nanoframework
20-
ref: refs/tags/v5.2.2
20+
ref: refs/tags/v5.2.3
2121

2222
# scheduled build
2323
# the schedule is defined at the AZDO web interface because of inconsistencies with time zones
@@ -294,7 +294,7 @@ jobs:
294294
variables:
295295
DOTNET_NOLOGO: true
296296
# creates a counter and assigns it to the revision variable
297-
REVISION: $[counter('STM32_1_12_0_versioncounter', 0)]
297+
REVISION: $[counter('STM32_1_12_1_versioncounter', 0)]
298298
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
299299
TargetPlatform: "stm32"
300300

@@ -545,7 +545,7 @@ jobs:
545545
variables:
546546
DOTNET_NOLOGO: true
547547
# creates a counter and assigns it to the revision variable
548-
REVISION: $[counter('ESP32_1_12_0_versioncounter', 0)]
548+
REVISION: $[counter('ESP32_1_12_1_versioncounter', 0)]
549549
IDF_PATH: "D:/a/1/s/esp-idf"
550550
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
551551
TargetPlatform: "esp32"
@@ -621,7 +621,7 @@ jobs:
621621
variables:
622622
DOTNET_NOLOGO: true
623623
# creates a counter and assigns it to the revision variable
624-
REVISION: $[counter('TI_1_12_0_versioncounter', 0)]
624+
REVISION: $[counter('TI_1_12_1_versioncounter', 0)]
625625
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
626626
TargetPlatform: "ti_simplelink"
627627

@@ -672,7 +672,7 @@ jobs:
672672

673673
variables:
674674
# creates a counter and assigns it to the revision variable
675-
REVISION: $[counter('AZURERTOS_1_12_0_versioncounter', 0)]
675+
REVISION: $[counter('AZURERTOS_1_12_1_versioncounter', 0)]
676676
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
677677
TargetPlatform: "azure_rtos"
678678

‎azure-pipelines-templates/build-espressif-esp32-targets.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
- task: Cache@2
1818
displayName: Cache IDF components
1919
inputs:
20-
key: 'esp-idf-components-cache | 5_2_2'
20+
key: 'esp-idf-components-cache | 5_2_3'
2121
path: $(Agent.BuildDirectory)/s/esp-idf/components
2222
cacheHitVar: ESP32_COMPONENTS_RESTORED
2323

‎azure-pipelines-templates/download-install-esp32-build-components.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ steps:
66
- task: Cache@2
77
displayName: Cache ESP32 tools
88
inputs:
9-
key: "esp32_tools | 5_2_2"
10-
restoreKeys: 5_2_2
9+
key: "esp32_tools | 5_2_3"
10+
restoreKeys: 5_2_3
1111
path: $(UserProfile)\.espressif\tools
1212
cacheHitVar: ESP32_TOOLS_CACHE_RESTORED
1313

‎azure-pipelines.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ resources:
4848
type: github
4949
name: espressif/esp-idf
5050
endpoint: nanoframework
51-
ref: 'refs/tags/v5.2.2'
51+
ref: 'refs/tags/v5.2.3'
5252
- repository: mscorlib
5353
type: github
5454
name: nanoframework/CoreLibrary
@@ -412,7 +412,7 @@ jobs:
412412
variables:
413413
DOTNET_NOLOGO: true
414414
# creates a counter and assigns it to the revision variable
415-
REVISION: $[counter('STM32_1_12_0_versioncounter', 0)]
415+
REVISION: $[counter('STM32_1_12_1_versioncounter', 0)]
416416
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
417417
TargetPlatform: "stm32"
418418

@@ -562,7 +562,7 @@ jobs:
562562
variables:
563563
DOTNET_NOLOGO: true
564564
# creates a counter and assigns it to the revision variable
565-
REVISION: $[counter('ESP32_1_12_0_versioncounter', 0)]
565+
REVISION: $[counter('ESP32_1_12_1_versioncounter', 0)]
566566
IDF_PATH: "D:/a/1/s/esp-idf"
567567
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
568568
TargetPlatform: "esp32"
@@ -643,7 +643,7 @@ jobs:
643643
variables:
644644
DOTNET_NOLOGO: true
645645
# creates a counter and assigns it to the revision variable
646-
REVISION: $[counter('NXP_1_12_0_versioncounter', 0)]
646+
REVISION: $[counter('NXP_1_12_1_versioncounter', 0)]
647647
GIT_LFS_SKIP_SMUDGE: 1
648648
TargetPlatform: "freertos"
649649

@@ -721,7 +721,7 @@ jobs:
721721
variables:
722722
DOTNET_NOLOGO: true
723723
# creates a counter and assigns it to the revision variable
724-
REVISION: $[counter('TI_1_12_0_versioncounter', 0)]
724+
REVISION: $[counter('TI_1_12_1_versioncounter', 0)]
725725
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
726726
TargetPlatform: "ti_simplelink"
727727

@@ -792,7 +792,7 @@ jobs:
792792

793793
variables:
794794
# creates a counter and assigns it to the revision variable
795-
REVISION: $[counter('AZURERTOS_1_12_0_versioncounter', 0)]
795+
REVISION: $[counter('AZURERTOS_1_12_1_versioncounter', 0)]
796796
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
797797
TargetPlatform: "azure_rtos"
798798

@@ -843,7 +843,7 @@ jobs:
843843
value: true
844844
# creates a counter and assigns it to the revision variable
845845
- name: REVISION
846-
value: $[counter('WIN32_1_12_0_versioncounter', 0)]
846+
value: $[counter('WIN32_1_12_1_versioncounter', 0)]
847847
- name: LITTLEFS_PATH
848848
value: "D:/a/1/s/littlefs"
849849

‎targets/ESP32/CMakeLists.txt

+10-4
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,16 @@ if(ESP32_IDF_PATH)
5757
endif()
5858
endif()
5959

60-
# WHEN CHANGING THIS MAKE SURE TO UPDATE:
61-
# 1. the dev containers
62-
# 2. ref in AZDO pipeline yaml in Community Targets repo
63-
set(ESP32_IDF_TAG "5.2.2" CACHE INTERNAL "ESP32 IDF tag")
60+
#################################################################################
61+
# WHEN CHANGING THIS MAKE SURE TO UPDATE: #
62+
# 1. the github tags in dev containers SRC #
63+
# 2. ref in AZDO pipeline yaml (main, nightly build and Community Targets repo) #
64+
# 3. cache tag in build and download AZDO yaml templates #
65+
#################################################################################
66+
#################################################################################
67+
set(ESP32_IDF_TAG "5.2.3" CACHE INTERNAL "ESP32 IDF tag")
68+
#################################################################################
69+
#################################################################################
6470

6571
if(NO_ESP32_IDF_PATH)
6672
# no ESP32 IDF source specified, download it from official repo

‎version.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.12.0",
3+
"version": "1.12.1",
44
"assemblyVersion": {
55
"precision": "revision"
66
},

0 commit comments

Comments
 (0)