From 31e3646d31da4175873981fe41d50a4615c72575 Mon Sep 17 00:00:00 2001 From: josesimoes Date: Fri, 28 Jun 2024 03:17:51 +0100 Subject: [PATCH] Migrate IDF to v5.1.4 - Bump versions in dev containers. - Bump versions in revision counters for builds. - Update tag in ESP32 build components cache. --- .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 +++++----- .../download-install-esp32-build-components.yml | 4 ++-- azure-pipelines.yml | 14 +++++++------- targets/ESP32/CMakeLists.txt | 2 +- version.json | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.devcontainer/All/Dockerfile.All b/.devcontainer/All/Dockerfile.All index 39a1effee3..fd9df0eadf 100644 --- a/.devcontainer/All/Dockerfile.All +++ b/.devcontainer/All/Dockerfile.All @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-all:v2.46 +FROM ghcr.io/nanoframework/dev-container-all:v2.47 diff --git a/.devcontainer/All/Dockerfile.All.SRC b/.devcontainer/All/Dockerfile.All.SRC index ac3583b978..357570322d 100644 --- a/.devcontainer/All/Dockerfile.All.SRC +++ b/.devcontainer/All/Dockerfile.All.SRC @@ -90,7 +90,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.1.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf +RUN git clone --branch v5.1.4 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 0146f742d0..ebd315629a 100644 --- a/.devcontainer/ESP32/Dockerfile.ESP32 +++ b/.devcontainer/ESP32/Dockerfile.ESP32 @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-esp32:v2.30 +FROM ghcr.io/nanoframework/dev-container-esp32:v2.31 diff --git a/.devcontainer/ESP32/Dockerfile.ESP32.SRC b/.devcontainer/ESP32/Dockerfile.ESP32.SRC index 0e3e27a4a3..581b2417a2 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.1.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf +RUN git clone --branch v5.1.4 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 2880ca8c9a..a3f55e0d43 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.1.3 + ref: refs/tags/v5.1.4 # scheduled build # the schedule is defined at the AZDO web interface because of inconsistencies with time zones @@ -293,7 +293,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('STM32_1_9_1_versioncounter', 0)] + REVISION: $[counter('STM32_1_10_0_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "stm32" @@ -544,7 +544,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('ESP32_1_9_1_versioncounter', 0)] + REVISION: $[counter('ESP32_1_10_0_versioncounter', 0)] IDF_PATH: "D:/a/1/s/esp-idf" PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip TargetPlatform: "esp32" @@ -620,7 +620,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('TI_1_9_1_versioncounter', 0)] + REVISION: $[counter('TI_1_10_0_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "ti_simplelink" @@ -671,7 +671,7 @@ jobs: variables: # creates a counter and assigns it to the revision variable - REVISION: $[counter('AZURERTOS_1_9_1_versioncounter', 0)] + REVISION: $[counter('AZURERTOS_1_10_0_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "azure_rtos" diff --git a/azure-pipelines-templates/download-install-esp32-build-components.yml b/azure-pipelines-templates/download-install-esp32-build-components.yml index 5c5878736d..de549d5d44 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_1_3" - restoreKeys: 5_1_3 + key: "esp32_tools | 5_1_4" + restoreKeys: 5_1_4 path: $(UserProfile)\.espressif\tools cacheHitVar: ESP32_TOOLS_CACHE_RESTORED diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d48bca72ae..d8271d7553 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.1.3' + ref: 'refs/tags/v5.1.4' - repository: mscorlib type: github name: nanoframework/CoreLibrary @@ -406,7 +406,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('STM32_1_9_1_versioncounter', 0)] + REVISION: $[counter('STM32_1_10_0_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "stm32" @@ -556,7 +556,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('ESP32_1_9_1_versioncounter', 0)] + REVISION: $[counter('ESP32_1_10_0_versioncounter', 0)] IDF_PATH: "D:/a/1/s/esp-idf" PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip TargetPlatform: "esp32" @@ -637,7 +637,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('NXP_1_9_1_versioncounter', 0)] + REVISION: $[counter('NXP_1_10_0_versioncounter', 0)] GIT_LFS_SKIP_SMUDGE: 1 TargetPlatform: "freertos" @@ -715,7 +715,7 @@ jobs: variables: DOTNET_NOLOGO: true # creates a counter and assigns it to the revision variable - REVISION: $[counter('TI_1_9_1_versioncounter', 0)] + REVISION: $[counter('TI_1_10_0_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "ti_simplelink" @@ -786,7 +786,7 @@ jobs: variables: # creates a counter and assigns it to the revision variable - REVISION: $[counter('AZURERTOS_1_9_1_versioncounter', 0)] + REVISION: $[counter('AZURERTOS_1_10_0_versioncounter', 0)] HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)] TargetPlatform: "azure_rtos" @@ -837,7 +837,7 @@ jobs: value: true # creates a counter and assigns it to the revision variable - name: REVISION - value: $[counter('WIN32_1_9_1_versioncounter', 0)] + value: $[counter('WIN32_1_10_0_versioncounter', 0)] steps: - template: azure-pipelines-templates/nb-gitversioning.yml diff --git a/targets/ESP32/CMakeLists.txt b/targets/ESP32/CMakeLists.txt index dd8a9a3869..e047b8292a 100644 --- a/targets/ESP32/CMakeLists.txt +++ b/targets/ESP32/CMakeLists.txt @@ -60,7 +60,7 @@ 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.1.3" CACHE INTERNAL "ESP32 IDF tag") +set(ESP32_IDF_TAG "5.1.4" 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 bfb66e4c3a..e00070e3db 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.9.1", + "version": "1.10.0", "assemblyVersion": { "precision": "revision" }, @@ -25,4 +25,4 @@ "versionIncrement": "build", "firstUnstableTag": "preview" } -} \ No newline at end of file +}