Skip to content

Commit

Permalink
Merge branch 'v1.3/submodule_update' into 'release/v1.3'
Browse files Browse the repository at this point in the history
[v1.3] Update the chip submodule to latest v1.3-branch to include latest insights version.

See merge request app-frameworks/esp-matter!934
  • Loading branch information
dhrishi committed Nov 13, 2024
2 parents f439ecb + 94def04 commit 38fbb86
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 20 deletions.
4 changes: 1 addition & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ variables:
IDF_CHECKOUT_REF: "v5.2.1"
# This variable represents the short hash of the connectedhomeip submodule.
# Note: Do change this short hash on submodule update MRs.
CHIP_SHORT_HASH: "82748b9f0e"
CHIP_SHORT_HASH: "735b69f73e"
DOCKER_IMAGE_NAME: "espressif/chip-idf"

.add_gitlab_ssh_key: &add_gitlab_ssh_key |
Expand Down Expand Up @@ -75,7 +75,6 @@ variables:
# fetch submodules
- export PYTHONPATH=${IDF_PATH}/tools/ci/python_packages/:${PYTHONPATH}
- pip install python-gitlab
- python tools/ci/ci_fetch_submodule.py
- cd examples/openthread/ot_rcp
- idf.py set-target esp32h2
- idf.py build
Expand All @@ -85,7 +84,6 @@ variables:
- export PYTHONPATH=${IDF_PATH}/tools/ci/python_packages/:${PYTHONPATH}
- pip install python-gitlab
- cd ${IDF_PATH}
- python tools/ci/ci_fetch_submodule.py

.setup_matter: &setup_matter
- cd ${ESP_MATTER_PATH}
Expand Down
10 changes: 0 additions & 10 deletions components/esp_matter/idf_component.yml

This file was deleted.

2 changes: 1 addition & 1 deletion connectedhomeip/connectedhomeip
12 changes: 6 additions & 6 deletions examples/managed_component_light/main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ dependencies:
version: "^1.3.0"
# This matches the dependency of esp_insights
espressif/esp_diag_data_store:
version: "1.0.1"
require: public
rules:
- if: "idf_version >=5.0"
- if: "target != esp32h2"

version: "1.0.1"
require: public
rules:
- if: "idf_version >=5.0"
- if: "target != esp32h2"

0 comments on commit 38fbb86

Please sign in to comment.