mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-19 14:26:01 -04:00
change(version): Update version to v5.4-dev
This commit is contained in:
parent
3ef14f52eb
commit
0436d49815
@ -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.3-dev
|
LATEST_GIT_TAG: v5.4-dev
|
||||||
|
|
||||||
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
|
||||||
@ -54,9 +54,9 @@ variables:
|
|||||||
CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py"
|
CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py"
|
||||||
|
|
||||||
# Docker images
|
# Docker images
|
||||||
ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.3:1"
|
ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.4:1"
|
||||||
ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.3:1-1"
|
ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.4:1-1"
|
||||||
TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.3:1"
|
TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.4:1"
|
||||||
SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5"
|
SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5"
|
||||||
PRE_COMMIT_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-pre-commit:1"
|
PRE_COMMIT_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-pre-commit:1"
|
||||||
|
|
||||||
@ -72,7 +72,7 @@ variables:
|
|||||||
CI_PYTHON_CONSTRAINT_BRANCH: ""
|
CI_PYTHON_CONSTRAINT_BRANCH: ""
|
||||||
|
|
||||||
# Update the filename for a specific ESP-IDF release. It is used only with CI_PYTHON_CONSTRAINT_BRANCH.
|
# Update the filename for a specific ESP-IDF release. It is used only with CI_PYTHON_CONSTRAINT_BRANCH.
|
||||||
CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v5.3.txt"
|
CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v5.4.txt"
|
||||||
|
|
||||||
# Set this variable to repository name of a Python tool you wish to install and test in the context of ESP-IDF CI.
|
# Set this variable to repository name of a Python tool you wish to install and test in the context of ESP-IDF CI.
|
||||||
# Keep the variable empty when not used.
|
# Keep the variable empty when not used.
|
||||||
|
@ -13,7 +13,7 @@ extern "C" {
|
|||||||
/** Major version number (X.x.x) */
|
/** Major version number (X.x.x) */
|
||||||
#define ESP_IDF_VERSION_MAJOR 5
|
#define ESP_IDF_VERSION_MAJOR 5
|
||||||
/** Minor version number (x.X.x) */
|
/** Minor version number (x.X.x) */
|
||||||
#define ESP_IDF_VERSION_MINOR 3
|
#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 0
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
set(IDF_VERSION_MAJOR 5)
|
set(IDF_VERSION_MAJOR 5)
|
||||||
set(IDF_VERSION_MINOR 3)
|
set(IDF_VERSION_MINOR 4)
|
||||||
set(IDF_VERSION_PATCH 0)
|
set(IDF_VERSION_PATCH 0)
|
||||||
|
|
||||||
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…
Reference in New Issue
Block a user