feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

change(version): Update version to v6.0-dev

Browse Source
This commit is contained in:
Ivan Grokhotkov
2025-05-06 20:36:32 +02:00
parent f019c5d549
commit f89d6ee5a0
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab/ci/common.yml
View File

@ -55,9 +55,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.5:3" ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v6.0:1"
ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.5:2-1" ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v6.0:1-1"
TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.5:2" TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v6.0: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"
@ -70,7 +70,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.5.txt" CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v6.0.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.

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

@ -11,9 +11,9 @@ extern "C" {
#endif #endif
/** Major version number (X.x.x) */ /** Major version number (X.x.x) */
#define ESP_IDF_VERSION_MAJOR 5 #define ESP_IDF_VERSION_MAJOR 6
/** Minor version number (x.X.x) */ /** Minor version number (x.X.x) */
#define ESP_IDF_VERSION_MINOR 5 #define ESP_IDF_VERSION_MINOR 0
/** Patch version number (x.x.X) */ /** Patch version number (x.x.X) */
#define ESP_IDF_VERSION_PATCH 0 #define ESP_IDF_VERSION_PATCH 0

4
tools/cmake/version.cmake
View File

@ -1,5 +1,5 @@
set(IDF_VERSION_MAJOR 5) set(IDF_VERSION_MAJOR 6)
set(IDF_VERSION_MINOR 5) set(IDF_VERSION_MINOR 0)
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}")