Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate IDF to v5.2.3 #3036

Merged
merged 1 commit into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/All/Dockerfile.All
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
2 changes: 1 addition & 1 deletion .devcontainer/All/Dockerfile.All.SRC
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/ESP32/Dockerfile.ESP32
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/nanoframework/dev-container-esp32:v2.33
FROM ghcr.io/nanoframework/dev-container-esp32:v2.34
2 changes: 1 addition & 1 deletion .devcontainer/ESP32/Dockerfile.ESP32.SRC
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
10 changes: 5 additions & 5 deletions azure-pipelines-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 7 additions & 7 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"

Expand Down
14 changes: 10 additions & 4 deletions targets/ESP32/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -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"
},
Expand Down
Loading