Use specific commit for matter sdk

MonicaisHer · Jan 17, 2024 · 4751257 · 4751257
1 parent 1e5909b
commit 4751257
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/snapcraft/parts/plugins/matter_plugin.py b/snapcraft/parts/plugins/matter_plugin.py
@@ -128,11 +128,11 @@ def get_build_commands(self) -> List[str]:
         commands.extend(
             [
                 "if [ ! -d matter ]; then",
-                f"    git clone --depth 1 -b {options.matter_sdk_version} {MATTER_REPO} matter;",
+                f"    git clone {MATTER_REPO} matter && cd matter && git checkout {options.matter_sdk_version};",
                 "else",
                 "    echo 'Matter repository already exists, skip clone';",
+                "    cd matter;",
                 "fi",
-                "cd matter;",
             ]
         )
 

diff --git a/tests/spread/plugins/craft-parts/build-and-run-hello/matter-hello/snap/snapcraft.yaml b/tests/spread/plugins/craft-parts/build-and-run-hello/matter-hello/snap/snapcraft.yaml
@@ -12,7 +12,7 @@ apps:
 parts:
   lighting-hello:
     plugin: matter
-    matter-sdk-version: "master"
+    matter-sdk-version: "1536ca2" # use this commit with ptpython version fix; needs to be updated once sdk have a stable release
     matter-zap-version: "v2023.11.13"
     source: app
     override-build: |

diff --git a/tests/unit/parts/plugins/test_matter_plugin.py b/tests/unit/parts/plugins/test_matter_plugin.py
@@ -102,11 +102,11 @@ def test_get_build_commands(part_info):
     expected_commands.extend(
         [
             "if [ ! -d matter ]; then",
-            f"    git clone --depth 1 -b {sdk_version} {MATTER_REPO} matter;",
+            f"    git clone {MATTER_REPO} matter && cd matter && git checkout {options.matter_sdk_version};",
             "else",
             "    echo 'Matter repository already exists, skip clone';",
+            "    cd matter;",
             "fi",
-            "cd matter;",
             "scripts/checkout_submodules.py --shallow --platform linux",
             r"sed -i 's/\/tmp/\/mnt/g' src/platform/Linux/CHIPLinuxStorage.h",
             r"sed -i 's/\/tmp/\/mnt/g' src/platform/Linux/CHIPPlatformConfig.h",