Skip to content

Commit 91a7702

Browse files
agnersagners
authored
Merge pull request #11 from home-assistant-libs/bump-matter-sdk-to-v1.1.0.1
Bump Matter SDK to v1.1.0.1
2 parents c2c642b + 213e5cd commit 91a7702

8 files changed

+291
-343
lines changed

‎.github/workflows/build.yaml

+48-25
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ name: CHIP wheels build
22

33
on: push
44

5+
env:
6+
matter_sdk_ref: v1.1.0.1
7+
58
jobs:
69
build_prepare:
710
name: Prepare build
8-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04
912
outputs:
1013
version: ${{ steps.python-version.outputs.value }}
1114
channel: ${{ steps.version.outputs.channel }}
@@ -38,6 +41,37 @@ jobs:
3841
find: '-'
3942
replace: '_'
4043
replaceAll: true
44+
- name: Checkout CHIP SDK repository
45+
uses: actions/checkout@v3
46+
with:
47+
repository: project-chip/connectedhomeip
48+
ref: ${{ env.matter_sdk_ref }}
49+
path: ./project-chip
50+
- name: Checkout submodules
51+
working-directory: ./project-chip
52+
run: scripts/checkout_submodules.py --shallow --platform linux
53+
- name: Apply patches
54+
working-directory: ./project-chip
55+
run: |
56+
for patch in ../*.patch
57+
do
58+
echo "Applying ${patch}"
59+
patch -p1 < $patch
60+
done
61+
- name: Bootstrap
62+
working-directory: ./project-chip
63+
run: scripts/build/gn_bootstrap.sh
64+
- name: ZAP Code pre-generation
65+
working-directory: ./project-chip
66+
run: scripts/run_in_build_env.sh "scripts/codepregen.py ./zzz_pregenerated/"
67+
- name: Create Matter SDK tar
68+
working-directory: ./project-chip
69+
run: tar -caf ../project-chip.tar.zst --exclude .environment --use-compress-program=zstdmt .
70+
- name: Store Matter SDK as artifact
71+
uses: actions/upload-artifact@v3
72+
with:
73+
name: matter-sdk-${{ env.matter_sdk_ref }}
74+
path: ./project-chip.tar.zst
4175

4276
build_linux_python_lib:
4377
name: Build Python wheels for Linux (${{ matrix.arch.name }})
@@ -47,10 +81,10 @@ jobs:
4781
matrix:
4882
arch:
4983
- name: x86_64
50-
container: connectedhomeip/chip-build:0.6.18
84+
container: connectedhomeip/chip-build:0.7.0
5185
runner: ubuntu-22.04
5286
- name: aarch64
53-
container: agners/aarch64-chip-build:0.6.18
87+
container: agners/aarch64-chip-build:0.7.0
5488
runner: ARM64
5589

5690
runs-on: ${{ matrix.arch.runner }}
@@ -69,30 +103,18 @@ jobs:
69103
net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
70104

71105
steps:
72-
- name: Dump GitHub context
73-
env:
74-
GITHUB_CONTEXT: ${{ toJSON(github) }}
75-
run: echo "$GITHUB_CONTEXT"
76-
working-directory: ./
77-
- name: Checkout build repository
78-
uses: actions/checkout@v3
79-
- name: Checkout CHIP SDK repository
80-
uses: actions/checkout@v3
106+
- name: Restore Matter SDK from artifacts
107+
uses: actions/download-artifact@v3
81108
with:
82-
repository: project-chip/connectedhomeip
83-
ref: 4088a77f557e8571a39338fad51a1d8eb0131d79
84-
path: ./project-chip
85-
- name: Checkout submodules
86-
run: scripts/checkout_submodules.py --shallow --platform linux
87-
- name: Apply patches
109+
name: matter-sdk-${{ env.matter_sdk_ref }}
110+
- name: Extract Matter SDK from tar
88111
run: |
89-
patch -p1 < ../0001-Support-custom-platform-tag.patch
90-
patch -p1 < ../0002-Revert-Python-dependencies.patch
91-
patch -p1 < ../0003-Use-data-as-platform-storage-location.patch
92-
patch -p1 < ../0004-Drop-pygobject-dependency.patch
93-
patch -p1 < ../0005-Fix-Objects.py-for-Python-3.11-compatibility.patch
94-
patch -p1 < ../0006-Add-lookup-dicts-for-clusters-and-attributes.patch
95-
patch -p1 < ../0007-Fix-schema-not-found-error-on-vendor-specific-data.patch
112+
mkdir -p project-chip
113+
cd project-chip
114+
apt update && apt install zstd
115+
tar -xaf ../project-chip.tar.zst --use-compress-program=zstdmt .
116+
git config --global --add safe.directory "*"
117+
working-directory: ./
96118
- name: Bootstrap
97119
run: scripts/build/gn_bootstrap.sh
98120
- name: Setup Build, Run Build and Run Tests
@@ -106,6 +128,7 @@ jobs:
106128
chip_python_version=\"${{ needs.build_prepare.outputs.version }}\" \
107129
chip_python_package_prefix=\"home-assistant-chip\" \
108130
chip_python_platform_tag=\"manylinux_2_31\" \
131+
chip_code_pre_generated_directory=\"$(pwd)/zzz_pregenerated\" \
109132
"
110133
scripts/run_in_build_env.sh "ninja -C ./out chip-repl"
111134
- name: Run Python library specific unit tests

‎0001-Support-custom-platform-tag.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
From 60ee727300ce3685624cbece545f81d3c6350a8b Mon Sep 17 00:00:00 2001
2-
Message-Id: <60ee727300ce3685624cbece545f81d3c6350a8b.1676497054.git.stefan@agner.ch>
1+
From c46f6cb84fb189da723a9932a5195a553762e2b6 Mon Sep 17 00:00:00 2001
2+
Message-Id: <c46f6cb84fb189da723a9932a5195a553762e2b6.1684168831.git.stefan@agner.ch>
33
From: Stefan Agner <stefan@agner.ch>
44
Date: Tue, 22 Nov 2022 10:51:17 +0100
55
Subject: [PATCH] Support custom platform tag
@@ -9,7 +9,7 @@ Subject: [PATCH] Support custom platform tag
99
1 file changed, 10 insertions(+), 10 deletions(-)
1010

1111
diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn
12-
index a0381f096..8da839169 100644
12+
index 750de2b837..424ed433b1 100644
1313
--- a/src/controller/python/BUILD.gn
1414
+++ b/src/controller/python/BUILD.gn
1515
@@ -33,6 +33,15 @@ config("controller_wno_deprecate") {
@@ -28,7 +28,7 @@ index a0381f096..8da839169 100644
2828
}
2929

3030
shared_library("ChipDeviceCtrl") {
31-
@@ -322,16 +331,7 @@ chip_python_wheel_action("chip-core") {
31+
@@ -326,16 +335,7 @@ chip_python_wheel_action("chip-core") {
3232
cpu_tag = current_cpu
3333
}
3434

@@ -47,5 +47,5 @@ index a0381f096..8da839169 100644
4747
tags = "cp37-abi3-" + py_platform_tag
4848

4949
--
50-
2.39.1
50+
2.40.1
5151

‎0002-Revert-Python-dependencies.patch

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 476de3f0ff61b91d2547269ee62bc8c2a76a7441 Mon Sep 17 00:00:00 2001
2-
Message-Id: <476de3f0ff61b91d2547269ee62bc8c2a76a7441.1676497054.git.stefan@agner.ch>
3-
In-Reply-To: <60ee727300ce3685624cbece545f81d3c6350a8b.1676497054.git.stefan@agner.ch>
4-
References: <60ee727300ce3685624cbece545f81d3c6350a8b.1676497054.git.stefan@agner.ch>
1+
From 43df8b9e7a7032e467742a7a75f23c54564dbfa4 Mon Sep 17 00:00:00 2001
2+
Message-Id: <43df8b9e7a7032e467742a7a75f23c54564dbfa4.1684168831.git.stefan@agner.ch>
3+
In-Reply-To: <c46f6cb84fb189da723a9932a5195a553762e2b6.1684168831.git.stefan@agner.ch>
4+
References: <c46f6cb84fb189da723a9932a5195a553762e2b6.1684168831.git.stefan@agner.ch>
55
From: Stefan Agner <stefan@agner.ch>
66
Date: Mon, 19 Sep 2022 23:05:51 +0200
77
Subject: [PATCH] Revert Python dependencies
@@ -12,10 +12,10 @@ Remove the crypto libraries. They are not required in regular use.
1212
1 file changed, 5 deletions(-)
1313

1414
diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn
15-
index 8da839169..8c913d1f9 100644
15+
index 424ed433b1..2d7ff2de63 100644
1616
--- a/src/controller/python/BUILD.gn
1717
+++ b/src/controller/python/BUILD.gn
18-
@@ -308,11 +308,6 @@ chip_python_wheel_action("chip-core") {
18+
@@ -318,11 +318,6 @@ chip_python_wheel_action("chip-core") {
1919
"ipdb",
2020
"deprecation",
2121
"mobly",
@@ -26,7 +26,7 @@ index 8da839169..8c913d1f9 100644
2626
- "ecdsa",
2727
]
2828

29-
if (current_os == "mac") {
29+
if (current_cpu == "x64") {
3030
--
31-
2.39.1
31+
2.40.1
3232

‎0003-Use-data-as-platform-storage-location.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 74754ce606449449286a86227ab2161befe09a06 Mon Sep 17 00:00:00 2001
2-
Message-Id: <74754ce606449449286a86227ab2161befe09a06.1676497054.git.stefan@agner.ch>
3-
In-Reply-To: <60ee727300ce3685624cbece545f81d3c6350a8b.1676497054.git.stefan@agner.ch>
4-
References: <60ee727300ce3685624cbece545f81d3c6350a8b.1676497054.git.stefan@agner.ch>
1+
From 502a3b7818188f083d080afcad12b8133eea3020 Mon Sep 17 00:00:00 2001
2+
Message-Id: <502a3b7818188f083d080afcad12b8133eea3020.1684168831.git.stefan@agner.ch>
3+
In-Reply-To: <c46f6cb84fb189da723a9932a5195a553762e2b6.1684168831.git.stefan@agner.ch>
4+
References: <c46f6cb84fb189da723a9932a5195a553762e2b6.1684168831.git.stefan@agner.ch>
55
From: Stefan Agner <stefan@agner.ch>
66
Date: Fri, 27 May 2022 16:38:14 +0200
77
Subject: [PATCH] Use /data as platform storage location
@@ -11,7 +11,7 @@ Subject: [PATCH] Use /data as platform storage location
1111
1 file changed, 6 insertions(+)
1212

1313
diff --git a/src/platform/Linux/BUILD.gn b/src/platform/Linux/BUILD.gn
14-
index 69d028925..af1019350 100644
14+
index 69d0289254..af10193504 100644
1515
--- a/src/platform/Linux/BUILD.gn
1616
+++ b/src/platform/Linux/BUILD.gn
1717
@@ -38,6 +38,12 @@ if (chip_mdns == "platform") {
@@ -28,5 +28,5 @@ index 69d028925..af1019350 100644
2828
"../DeviceSafeQueue.cpp",
2929
"../DeviceSafeQueue.h",
3030
--
31-
2.39.1
31+
2.40.1
3232

‎0004-Drop-pygobject-dependency.patch

-43
This file was deleted.

0 commit comments

Comments
 (0)