diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml index f4bd4951335..7a2e291425c 100644 --- a/.gitlab/ci/common.yml +++ b/.gitlab/ci/common.yml @@ -41,7 +41,7 @@ variables: # --prune --prune-tags: in case remote branch or tag is force pushed GIT_FETCH_EXTRA_FLAGS: "--no-recurse-submodules --prune --prune-tags" - LATEST_GIT_TAG: v6.1-dev + LATEST_GIT_TAG: v6.2-dev SUBMODULE_FETCH_TOOL: "tools/ci/ci_fetch_submodule.py" # by default we will fetch all submodules @@ -56,9 +56,9 @@ variables: CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py" # Docker images - ESP_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.1:1" - ESP_IDF_DOC_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.1-docs:1" - TARGET_TEST_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.1-target-test:1" + ESP_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.2:1" + ESP_IDF_DOC_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.2-docs:1" + TARGET_TEST_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.2-target-test:1" SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5" # cache python dependencies @@ -70,7 +70,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.v6.1.txt" + CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v6.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. @@ -284,12 +284,12 @@ variables: CCACHE_DIR: "/var/tmp/cache/idf_ccache" tags: - macos-tart - image: macos-sequoia-idf-v6.1 + image: macos-sequoia-idf-v6.2 after_script: [] # ccache now is disabled for macos brew runners timeout: 30m .brew-windows-settings: - image: windows_11_idf_v6_1 + image: windows_11_idf_v6_2 tags: [windows-vm, brew] variables: GIT_STRATEGY: fetch diff --git a/components/esp_common/include/esp_idf_version.h b/components/esp_common/include/esp_idf_version.h index 6a5c781e86f..0a0d9204bf6 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 6 /** 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 be95075ffbf..321b85251f9 100644 --- a/tools/cmake/version.cmake +++ b/tools/cmake/version.cmake @@ -1,5 +1,5 @@ set(IDF_VERSION_MAJOR 6) -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}")