Skip to content

Commit 5f5feb1

Browse files
josesimoesjosesimoes
authored
Migrate IDF to v5.1.4 (#2975)
***NO_CI***
1 parent 9076eb7 commit 5f5feb1

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

‎.devcontainer/All/Dockerfile.All‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-all:v2.46
1+
FROM ghcr.io/nanoframework/dev-container-all:v2.47

‎.devcontainer/All/Dockerfile.All.SRC‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-
9090
RUN git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
9191

9292
# Clone ESP-IDF
93-
RUN git clone --branch v5.1.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
93+
RUN git clone --branch v5.1.4 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
9494

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

‎.devcontainer/ESP32/Dockerfile.ESP32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-esp32:v2.30
1+
FROM ghcr.io/nanoframework/dev-container-esp32:v2.31

‎.devcontainer/ESP32/Dockerfile.ESP32.SRC‎

Lines changed: 1 addition & 1 deletion
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.1.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
51+
RUN git clone --branch v5.1.4 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‎

Lines changed: 5 additions & 5 deletions
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.1.3
20+
ref: refs/tags/v5.1.4
2121

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

@@ -544,7 +544,7 @@ jobs:
544544
variables:
545545
DOTNET_NOLOGO: true
546546
# creates a counter and assigns it to the revision variable
547-
REVISION: $[counter('ESP32_1_9_1_versioncounter', 0)]
547+
REVISION: $[counter('ESP32_1_10_0_versioncounter', 0)]
548548
IDF_PATH: "D:/a/1/s/esp-idf"
549549
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
550550
TargetPlatform: "esp32"
@@ -620,7 +620,7 @@ jobs:
620620
variables:
621621
DOTNET_NOLOGO: true
622622
# creates a counter and assigns it to the revision variable
623-
REVISION: $[counter('TI_1_9_1_versioncounter', 0)]
623+
REVISION: $[counter('TI_1_10_0_versioncounter', 0)]
624624
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
625625
TargetPlatform: "ti_simplelink"
626626

@@ -671,7 +671,7 @@ jobs:
671671

672672
variables:
673673
# creates a counter and assigns it to the revision variable
674-
REVISION: $[counter('AZURERTOS_1_9_1_versioncounter', 0)]
674+
REVISION: $[counter('AZURERTOS_1_10_0_versioncounter', 0)]
675675
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
676676
TargetPlatform: "azure_rtos"
677677

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

Lines changed: 2 additions & 2 deletions
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_1_3"
10-
restoreKeys: 5_1_3
9+
key: "esp32_tools | 5_1_4"
10+
restoreKeys: 5_1_4
1111
path: $(UserProfile)\.espressif\tools
1212
cacheHitVar: ESP32_TOOLS_CACHE_RESTORED
1313

‎azure-pipelines.yml‎

Lines changed: 7 additions & 7 deletions
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.1.3'
51+
ref: 'refs/tags/v5.1.4'
5252
- repository: mscorlib
5353
type: github
5454
name: nanoframework/CoreLibrary
@@ -406,7 +406,7 @@ jobs:
406406
variables:
407407
DOTNET_NOLOGO: true
408408
# creates a counter and assigns it to the revision variable
409-
REVISION: $[counter('STM32_1_9_1_versioncounter', 0)]
409+
REVISION: $[counter('STM32_1_10_0_versioncounter', 0)]
410410
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
411411
TargetPlatform: "stm32"
412412

@@ -556,7 +556,7 @@ jobs:
556556
variables:
557557
DOTNET_NOLOGO: true
558558
# creates a counter and assigns it to the revision variable
559-
REVISION: $[counter('ESP32_1_9_1_versioncounter', 0)]
559+
REVISION: $[counter('ESP32_1_10_0_versioncounter', 0)]
560560
IDF_PATH: "D:/a/1/s/esp-idf"
561561
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
562562
TargetPlatform: "esp32"
@@ -637,7 +637,7 @@ jobs:
637637
variables:
638638
DOTNET_NOLOGO: true
639639
# creates a counter and assigns it to the revision variable
640-
REVISION: $[counter('NXP_1_9_1_versioncounter', 0)]
640+
REVISION: $[counter('NXP_1_10_0_versioncounter', 0)]
641641
GIT_LFS_SKIP_SMUDGE: 1
642642
TargetPlatform: "freertos"
643643

@@ -715,7 +715,7 @@ jobs:
715715
variables:
716716
DOTNET_NOLOGO: true
717717
# creates a counter and assigns it to the revision variable
718-
REVISION: $[counter('TI_1_9_1_versioncounter', 0)]
718+
REVISION: $[counter('TI_1_10_0_versioncounter', 0)]
719719
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
720720
TargetPlatform: "ti_simplelink"
721721

@@ -786,7 +786,7 @@ jobs:
786786

787787
variables:
788788
# creates a counter and assigns it to the revision variable
789-
REVISION: $[counter('AZURERTOS_1_9_1_versioncounter', 0)]
789+
REVISION: $[counter('AZURERTOS_1_10_0_versioncounter', 0)]
790790
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
791791
TargetPlatform: "azure_rtos"
792792

@@ -837,7 +837,7 @@ jobs:
837837
value: true
838838
# creates a counter and assigns it to the revision variable
839839
- name: REVISION
840-
value: $[counter('WIN32_1_9_1_versioncounter', 0)]
840+
value: $[counter('WIN32_1_10_0_versioncounter', 0)]
841841

842842
steps:
843843
- template: azure-pipelines-templates/nb-gitversioning.yml

‎targets/ESP32/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ endif()
6060
# WHEN CHANGING THIS MAKE SURE TO UPDATE:
6161
# 1. the dev containers
6262
# 2. ref in AZDO pipeline yaml in Community Targets repo
63-
set(ESP32_IDF_TAG "5.1.3" CACHE INTERNAL "ESP32 IDF tag")
63+
set(ESP32_IDF_TAG "5.1.4" CACHE INTERNAL "ESP32 IDF tag")
6464

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

‎version.json‎

Lines changed: 2 additions & 2 deletions
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.9.1",
3+
"version": "1.10.0",
44
"assemblyVersion": {
55
"precision": "revision"
66
},
@@ -25,4 +25,4 @@
2525
"versionIncrement": "build",
2626
"firstUnstableTag": "preview"
2727
}
28-
}
28+
}

0 commit comments

Comments
 (0)