From 0585cf0d96cc0c41cdcd004579fb0c3a423bcfdc Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Wed, 30 Aug 2023 09:32:38 +0800 Subject: [PATCH 1/2] fix(ci): pin component manager version to older one to fix build --- .../build_system/cmake/component_manager/main/idf_component.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/build_system/cmake/component_manager/main/idf_component.yml b/examples/build_system/cmake/component_manager/main/idf_component.yml index 1a90a2c8c4..d9f2ca58f4 100644 --- a/examples/build_system/cmake/component_manager/main/idf_component.yml +++ b/examples/build_system/cmake/component_manager/main/idf_component.yml @@ -4,7 +4,7 @@ dependencies: # Defining a dependency from the registry: # https://components.espressif.com/component/example/cmp - example/cmp: ">=3.3.3" + example/cmp: "=3.3.8" # # Other ways to define dependencies # From 5dc5a442a291f0e6180244a55095a4a4ca1776b5 Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Fri, 25 Aug 2023 10:56:06 +0800 Subject: [PATCH 2/2] versions: Update version to 4.3.6 --- components/esp_common/include/esp_idf_version.h | 2 +- make/version.mk | 2 +- tools/cmake/version.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_common/include/esp_idf_version.h b/components/esp_common/include/esp_idf_version.h index ded3540995..60293e6912 100644 --- a/components/esp_common/include/esp_idf_version.h +++ b/components/esp_common/include/esp_idf_version.h @@ -23,7 +23,7 @@ extern "C" { /** Minor version number (x.X.x) */ #define ESP_IDF_VERSION_MINOR 3 /** Patch version number (x.x.X) */ -#define ESP_IDF_VERSION_PATCH 5 +#define ESP_IDF_VERSION_PATCH 6 /** * Macro to convert IDF version number into an integer diff --git a/make/version.mk b/make/version.mk index 3bd6d6af3e..95cd588568 100644 --- a/make/version.mk +++ b/make/version.mk @@ -1,3 +1,3 @@ IDF_VERSION_MAJOR := 4 IDF_VERSION_MINOR := 3 -IDF_VERSION_PATCH := 5 +IDF_VERSION_PATCH := 6 diff --git a/tools/cmake/version.cmake b/tools/cmake/version.cmake index 82086b783f..8a348ef20b 100644 --- a/tools/cmake/version.cmake +++ b/tools/cmake/version.cmake @@ -1,3 +1,3 @@ set(IDF_VERSION_MAJOR 4) set(IDF_VERSION_MINOR 3) -set(IDF_VERSION_PATCH 5) +set(IDF_VERSION_PATCH 6)