From 13342fc91e020f05e175e0b91083169fc5c777af Mon Sep 17 00:00:00 2001
From: Christian Leithner <christian_leithner@comcast.com>
Date: Mon, 10 Aug 2026 17:14:32 +0000
Subject: [PATCH 1/3] fix(matter): bump matter-version to cap
 googleapis-common-protos

Pin the Matter SDK to project-chip/connectedhomeip@41ddb15 (PR #73448 on
v1.5-branch), which caps googleapis-common-protos below 1.75.1. The 1.75.1
release raised its protobuf requirement to >=6.33.5, conflicting with the
pinned protobuf~=5.28.2 and making the pigweed build venv unresolvable. This
was failing the Matter sample-app build (build_examples.py) in the builder
Docker image across many CI jobs.
---
 matter-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matter-version b/matter-version
index b314cb0c..2d8c880b 100644
--- a/matter-version
+++ b/matter-version
@@ -1 +1 @@
-v1.5.1.0
+41ddb15b08f30ea4d16c3306df0b5c4caa3a5845

From 5f665371792b6f803ede3673abd17fe318c1f5cb Mon Sep 17 00:00:00 2001
From: Christian Leithner <christian_leithner@comcast.com>
Date: Mon, 10 Aug 2026 17:28:30 +0000
Subject: [PATCH 2/3] fix(matter): fetch Matter by ref so a commit SHA works

git clone --branch rejects raw commit SHAs, so pinning matter-version to a
SHA broke the clone in build-matter.sh and docker/Dockerfile. Replace the
--branch clone with git init + shallow fetch of MATTER_REF + checkout
FETCH_HEAD, which resolves tags, branches, and SHAs uniformly. Capture the
resolved commit for the subsequent git reset --hard.
---
 build-matter.sh   | 16 ++++++++--------
 docker/Dockerfile |  5 ++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/build-matter.sh b/build-matter.sh
index c1c421f2..9d186347 100755
--- a/build-matter.sh
+++ b/build-matter.sh
@@ -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
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 37fcb27c..8c0a090e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -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 && \

From 207d79df6232f78443d074d4fee7e017cd7472f6 Mon Sep 17 00:00:00 2001
From: Christian Leithner <christian_leithner@comcast.com>
Date: Mon, 10 Aug 2026 17:31:21 +0000
Subject: [PATCH 3/3] Rev docker version#

---
 docker/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/version b/docker/version
index e3d06964..6d28a11d 100644
--- a/docker/version
+++ b/docker/version
@@ -1 +1 @@
-2.15
+2.16