espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 20:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update/version_5_4_1' into 'release/v5.4'

Browse Source 
Update version to 5.4.1

See merge request espressif/esp-idf!38067
This commit is contained in:
Michael (XIAO Xufeng)
2025-03-28 02:04:54 +08:00
parent daf8117cb9 4c2820d377
commit 2f7dcd862a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/ci/common.yml
View File

@@ -40,7 +40,7 @@ variables:
GIT_FETCH_EXTRA_FLAGS: "--no-recurse-submodules --prune --prune-tags" GIT_FETCH_EXTRA_FLAGS: "--no-recurse-submodules --prune --prune-tags"
# we're using .cache folder for caches # we're using .cache folder for caches
GIT_CLEAN_FLAGS: -ffdx -e .cache/ GIT_CLEAN_FLAGS: -ffdx -e .cache/
LATEST_GIT_TAG: v5.4 LATEST_GIT_TAG: v5.4.1
SUBMODULE_FETCH_TOOL: "tools/ci/ci_fetch_submodule.py" SUBMODULE_FETCH_TOOL: "tools/ci/ci_fetch_submodule.py"
# by default we will fetch all submodules # by default we will fetch all submodules

2
components/esp_common/include/esp_idf_version.h
View File

@@ -15,7 +15,7 @@ extern "C" {
/** Minor version number (x.X.x) */ /** Minor version number (x.X.x) */
#define ESP_IDF_VERSION_MINOR 4 #define ESP_IDF_VERSION_MINOR 4
/** Patch version number (x.x.X) */ /** Patch version number (x.x.X) */
#define ESP_IDF_VERSION_PATCH 0 #define ESP_IDF_VERSION_PATCH 1
/** /**
* Macro to convert IDF version number into an integer * Macro to convert IDF version number into an integer

2
tools/cmake/version.cmake
View File

@@ -1,5 +1,5 @@
set(IDF_VERSION_MAJOR 5) set(IDF_VERSION_MAJOR 5)
set(IDF_VERSION_MINOR 4) set(IDF_VERSION_MINOR 4)
set(IDF_VERSION_PATCH 0) set(IDF_VERSION_PATCH 1)
set(ENV{IDF_VERSION} "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}") set(ENV{IDF_VERSION} "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")