瀏覽代碼

Merge branch 'update/version_5_3_0' into 'master'

Start of v5.3 development (v5.3-dev)

See merge request !26669
Ivan Grokhotkov 2 年之前
父節點
當前提交
6f9d3bfc76
共有 3 個文件被更改,包括 6 次插入6 次删除
  1. 4 4
      .gitlab/ci/common.yml
  2. 1 1
      components/esp_common/include/esp_idf_version.h
  3. 1 1
      tools/cmake/version.cmake

+ 4 - 4
.gitlab/ci/common.yml

@@ -45,10 +45,10 @@ variables:
   PYTHON_VER: 3.8.17
 
   # Docker images
-  ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v5.2:2"
-  ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env-v5.2:2-1"
-  QEMU_IMAGE: "${CI_DOCKER_REGISTRY}/qemu-v5.2:2-20230522"
-  TARGET_TEST_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.2:2"
+  ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v5.3:1"
+  ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env-v5.3:1-1"
+  QEMU_IMAGE: "${CI_DOCKER_REGISTRY}/qemu-v5.3:1-20230522"
+  TARGET_TEST_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.3:1"
 
   SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5"
 

+ 1 - 1
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   2
+#define ESP_IDF_VERSION_MINOR   3
 /** Patch version number (x.x.X) */
 #define ESP_IDF_VERSION_PATCH   0
 

+ 1 - 1
tools/cmake/version.cmake

@@ -1,5 +1,5 @@
 set(IDF_VERSION_MAJOR 5)
-set(IDF_VERSION_MINOR 2)
+set(IDF_VERSION_MINOR 3)
 set(IDF_VERSION_PATCH 0)
 
 set(ENV{IDF_VERSION} "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")