Skip to content

Commit 38fbb86

Browse files
committedNov 13, 2024·
Merge branch 'v1.3/submodule_update' into 'release/v1.3'
[v1.3] Update the chip submodule to latest v1.3-branch to include latest insights version. See merge request app-frameworks/esp-matter!934
2 parents f439ecb + 94def04 commit 38fbb86

File tree

4 files changed

+8
-20
lines changed

4 files changed

+8
-20
lines changed
 

‎.gitlab-ci.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ variables:
2525
IDF_CHECKOUT_REF: "v5.2.1"
2626
# This variable represents the short hash of the connectedhomeip submodule.
2727
# Note: Do change this short hash on submodule update MRs.
28-
CHIP_SHORT_HASH: "82748b9f0e"
28+
CHIP_SHORT_HASH: "735b69f73e"
2929
DOCKER_IMAGE_NAME: "espressif/chip-idf"
3030

3131
.add_gitlab_ssh_key: &add_gitlab_ssh_key |
@@ -75,7 +75,6 @@ variables:
7575
# fetch submodules
7676
- export PYTHONPATH=${IDF_PATH}/tools/ci/python_packages/:${PYTHONPATH}
7777
- pip install python-gitlab
78-
- python tools/ci/ci_fetch_submodule.py
7978
- cd examples/openthread/ot_rcp
8079
- idf.py set-target esp32h2
8180
- idf.py build
@@ -85,7 +84,6 @@ variables:
8584
- export PYTHONPATH=${IDF_PATH}/tools/ci/python_packages/:${PYTHONPATH}
8685
- pip install python-gitlab
8786
- cd ${IDF_PATH}
88-
- python tools/ci/ci_fetch_submodule.py
8987

9088
.setup_matter: &setup_matter
9189
- cd ${ESP_MATTER_PATH}

‎components/esp_matter/idf_component.yml

-10
This file was deleted.

‎examples/managed_component_light/main/idf_component.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ dependencies:
1010
version: "^1.3.0"
1111
# This matches the dependency of esp_insights
1212
espressif/esp_diag_data_store:
13-
version: "1.0.1"
14-
require: public
15-
rules:
16-
- if: "idf_version >=5.0"
17-
- if: "target != esp32h2"
18-
13+
version: "1.0.1"
14+
require: public
15+
rules:
16+
- if: "idf_version >=5.0"
17+
- if: "target != esp32h2"
18+

0 commit comments

Comments
 (0)
Please sign in to comment.