From 7a3748edb3ae392af51a2ab144f0d582402be101 Mon Sep 17 00:00:00 2001 From: liyashuai Date: Mon, 26 Jun 2023 20:22:59 +0800 Subject: [PATCH] change example software version string format form v1.0 to 1.0 for apple homekit show --- .gitlab-ci.yml | 2 +- examples/blemesh_bridge/CMakeLists.txt | 2 +- examples/esp-now_bridge_light/CMakeLists.txt | 2 +- examples/generic_switch/CMakeLists.txt | 2 +- examples/light/CMakeLists.txt | 2 +- examples/light_switch/CMakeLists.txt | 2 +- examples/zap_light/CMakeLists.txt | 2 +- examples/zigbee_bridge/CMakeLists.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb6d8c3c8..f39165043 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ variables: .setup_ot_br: &setup_ot_br - cd ${CI_PROJECT_DIR} - - git clone ssh://git@gitlab.espressif.cn:27227/espressif/esp-thread-br.git + - git clone ${ESP_THREAD_BR_REPO_URL} - cd ${BR_PATH}/examples/basic_thread_border_router - idf.py set-target esp32s3 - idf.py build diff --git a/examples/blemesh_bridge/CMakeLists.txt b/examples/blemesh_bridge/CMakeLists.txt index 327fefcb8..351dd30dc 100644 --- a/examples/blemesh_bridge/CMakeLists.txt +++ b/examples/blemesh_bridge/CMakeLists.txt @@ -18,7 +18,7 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) endif() endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) -set(PROJECT_VER "v1.0") +set(PROJECT_VER "1.0") set(PROJECT_VER_NUMBER 1) set(ESP_MATTER_PATH $ENV{ESP_MATTER_PATH}) diff --git a/examples/esp-now_bridge_light/CMakeLists.txt b/examples/esp-now_bridge_light/CMakeLists.txt index a9f532379..d71206efc 100644 --- a/examples/esp-now_bridge_light/CMakeLists.txt +++ b/examples/esp-now_bridge_light/CMakeLists.txt @@ -18,7 +18,7 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) endif() endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) -set(PROJECT_VER "v1.0") +set(PROJECT_VER "1.0") set(PROJECT_VER_NUMBER 1) set(ESP_MATTER_PATH $ENV{ESP_MATTER_PATH}) diff --git a/examples/generic_switch/CMakeLists.txt b/examples/generic_switch/CMakeLists.txt index c4fe5d8cc..9f6b296b9 100644 --- a/examples/generic_switch/CMakeLists.txt +++ b/examples/generic_switch/CMakeLists.txt @@ -24,7 +24,7 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) endif() endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) -set(PROJECT_VER "v1.0") +set(PROJECT_VER "1.0") set(PROJECT_VER_NUMBER 1) set(ESP_MATTER_PATH $ENV{ESP_MATTER_PATH}) diff --git a/examples/light/CMakeLists.txt b/examples/light/CMakeLists.txt index 86235c389..f614a753f 100644 --- a/examples/light/CMakeLists.txt +++ b/examples/light/CMakeLists.txt @@ -24,7 +24,7 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) endif() endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) -set(PROJECT_VER "v1.0") +set(PROJECT_VER "1.0") set(PROJECT_VER_NUMBER 1) set(ESP_MATTER_PATH $ENV{ESP_MATTER_PATH}) diff --git a/examples/light_switch/CMakeLists.txt b/examples/light_switch/CMakeLists.txt index cd14f109e..56dc7bc0c 100644 --- a/examples/light_switch/CMakeLists.txt +++ b/examples/light_switch/CMakeLists.txt @@ -24,7 +24,7 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) endif() endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) -set(PROJECT_VER "v1.0") +set(PROJECT_VER "1.0") set(PROJECT_VER_NUMBER 1) set(ESP_MATTER_PATH $ENV{ESP_MATTER_PATH}) diff --git a/examples/zap_light/CMakeLists.txt b/examples/zap_light/CMakeLists.txt index c2f6e7adf..7bc827109 100644 --- a/examples/zap_light/CMakeLists.txt +++ b/examples/zap_light/CMakeLists.txt @@ -24,7 +24,7 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) endif() endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) -set(PROJECT_VER "v1.0") +set(PROJECT_VER "1.0") set(PROJECT_VER_NUMBER 1) set(ESP_MATTER_PATH $ENV{ESP_MATTER_PATH}) diff --git a/examples/zigbee_bridge/CMakeLists.txt b/examples/zigbee_bridge/CMakeLists.txt index 008efea51..76f3d9b53 100644 --- a/examples/zigbee_bridge/CMakeLists.txt +++ b/examples/zigbee_bridge/CMakeLists.txt @@ -17,7 +17,7 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) endif() endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) -set(PROJECT_VER "v1.0") +set(PROJECT_VER "1.0") set(PROJECT_VER_NUMBER 1) set(ESP_MATTER_PATH $ENV{ESP_MATTER_PATH})