From 39580dd08c8d5b8eab6e37c70e9aa50203e35db4 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 19 Apr 2023 12:24:35 +0200 Subject: [PATCH] version: update to v5.2.0 Starting IDF v5.2 development --- .gitlab-ci.yml | 12 ++++++------ components/esp_common/include/esp_idf_version.h | 2 +- tools/cmake/version.cmake | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 407615d8b0..1c7669d66d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,11 +62,11 @@ variables: # Docker images BOT_DOCKER_IMAGE_TAG: ":latest" - ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v5.1:1" - CLANG_STATIC_ANALYSIS_IMAGE: "${CI_DOCKER_REGISTRY}/clang-static-analysis-v5.1:1-1" - ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env-v5.1:1-1" - QEMU_IMAGE: "${CI_DOCKER_REGISTRY}/qemu-v5.1:1-20220802" - TARGET_TEST_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.1:1" + ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v5.2:1" + CLANG_STATIC_ANALYSIS_IMAGE: "${CI_DOCKER_REGISTRY}/clang-static-analysis-v5.2:1-1" + ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env-v5.2:1-1" + QEMU_IMAGE: "${CI_DOCKER_REGISTRY}/qemu-v5.2:1-20220802" + TARGET_TEST_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.2:1" SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:3" @@ -87,7 +87,7 @@ variables: 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.1.txt" + CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v5.2.txt" # 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. diff --git a/components/esp_common/include/esp_idf_version.h b/components/esp_common/include/esp_idf_version.h index a05a15efe6..cc68d2d132 100644 --- a/components/esp_common/include/esp_idf_version.h +++ b/components/esp_common/include/esp_idf_version.h @@ -13,7 +13,7 @@ extern "C" { /** Major version number (X.x.x) */ #define ESP_IDF_VERSION_MAJOR 5 /** Minor version number (x.X.x) */ -#define ESP_IDF_VERSION_MINOR 1 +#define ESP_IDF_VERSION_MINOR 2 /** Patch version number (x.x.X) */ #define ESP_IDF_VERSION_PATCH 0 diff --git a/tools/cmake/version.cmake b/tools/cmake/version.cmake index 4e33c6c6b2..037b9c088f 100644 --- a/tools/cmake/version.cmake +++ b/tools/cmake/version.cmake @@ -1,5 +1,5 @@ set(IDF_VERSION_MAJOR 5) -set(IDF_VERSION_MINOR 1) +set(IDF_VERSION_MINOR 2) set(IDF_VERSION_PATCH 0) set(ENV{IDF_VERSION} "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")