Skip to content

fix(matter): bump matter-version to cap googleapis-common-protos #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cleithner-comcast merged 3 commits into from
Aug 12, 2026
Merged

fix(matter): bump matter-version to cap googleapis-common-protos #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13342fc
fix(matter): bump matter-version to cap googleapis-common-protos
cleithner-comcast Aug 10, 2026
5f66537
fix(matter): fetch Matter by ref so a commit SHA works
cleithner-comcast Aug 10, 2026
207d79d
Rev docker version#
cleithner-comcast Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions build-matter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,21 @@ else
mkdir -p ${BUILD_DIR}

cd ${BUILD_DIR}
git clone \
--branch ${MATTER_REF} \
--depth 1 \
https://github.com/project-chip/connectedhomeip.git \
matter

# Fetch by ref so MATTER_REF may be a tag, branch, or commit SHA (git clone --branch rejects SHAs).
git init -q matter
cd ${MATTER_BUILD_DIR}
git remote add origin https://github.com/project-chip/connectedhomeip.git
git fetch --depth 1 origin ${MATTER_REF}
git checkout -q FETCH_HEAD
MATTER_COMMIT=$(git rev-parse HEAD)

./scripts/checkout_submodules.py --shallow --platform linux

git am ${MY_DIR}/third_party/matter/barton-library/patches/*.patch || (git am --abort && git reset --hard ${MATTER_REF} && exit 1)
git am ${MY_DIR}/third_party/matter/barton-library/patches/*.patch || (git am --abort && git reset --hard ${MATTER_COMMIT} && exit 1)
${MY_DIR}/third_party/matter/barton-library/linux/build.sh -o ${MATTER_INSTALL_DIR} -c ${MATTER_CONF_DIR} ${BUILD_WITH_STACK_SMASH_PROTECTION} ${BUILD_WITH_SANITIZER} ${BUILD_WITH_MESSAGE_TRACING}

cd ${MATTER_BUILD_DIR}
git reset --hard ${MATTER_REF}
git reset --hard ${MATTER_COMMIT}
fi

# Clean up
Expand Down
5 changes: 4 additions & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,11 @@ ARG MATTER_REF
SHELL ["/bin/bash", "-c"]
RUN test -n "${MATTER_REF}" || (echo "Error: MATTER_REF build arg is required" >&2 && exit 1) && \
cd /tmp && \
git clone --branch ${MATTER_REF} --depth 1 https://github.com/project-chip/connectedhomeip.git matter && \
git init -q matter && \
cd matter && \
git remote add origin https://github.com/project-chip/connectedhomeip.git && \
git fetch --depth 1 origin ${MATTER_REF} && \
git checkout -q FETCH_HEAD && \
./scripts/checkout_submodules.py --shallow --platform linux && \
${APPLY_PATCHES_PATH} /tmp/patches/matter . && \
export PKG_CONFIG_PATH=/usr/local/openssl/lib/pkgconfig:$PKG_CONFIG_PATH && \
Expand Down
2 changes: 1 addition & 1 deletion docker/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.15
2.16
2 changes: 1 addition & 1 deletion matter-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.5.1.0
41ddb15b08f30ea4d16c3306df0b5c4caa3a5845
Comment thread
cleithner-comcast marked this conversation as resolved.
Loading