mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'update/version_5_2_3' into 'release/v5.2'
Update version to 5.2.3 See merge request espressif/esp-idf!33744
This commit is contained in:
commit
587a39ff1a
@ -39,7 +39,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.2.1
|
LATEST_GIT_TAG: v5.2.3
|
||||||
|
|
||||||
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
|
||||||
|
@ -15,7 +15,7 @@ extern "C" {
|
|||||||
/** Minor version number (x.X.x) */
|
/** Minor version number (x.X.x) */
|
||||||
#define ESP_IDF_VERSION_MINOR 2
|
#define ESP_IDF_VERSION_MINOR 2
|
||||||
/** Patch version number (x.x.X) */
|
/** Patch version number (x.x.X) */
|
||||||
#define ESP_IDF_VERSION_PATCH 2
|
#define ESP_IDF_VERSION_PATCH 3
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Macro to convert IDF version number into an integer
|
* Macro to convert IDF version number into an integer
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
set(IDF_VERSION_MAJOR 5)
|
set(IDF_VERSION_MAJOR 5)
|
||||||
set(IDF_VERSION_MINOR 2)
|
set(IDF_VERSION_MINOR 2)
|
||||||
set(IDF_VERSION_PATCH 2)
|
set(IDF_VERSION_PATCH 3)
|
||||||
|
|
||||||
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}")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user