Merge pull request #19 from home-assistant-libs/bump-to-sve-23.09-rc1

Bump Matter SDK to SVE_23_09/rc1 tag

.github/workflows/build.yaml

@@ -3,14 +3,14 @@ name: CHIP wheels build
 on: push
 
 env:
-  matter_sdk_ref: v1.1.0.1
+  matter_sdk_ref: SVE_23_09/rc1
 
 jobs:
     build_prepare:
         name: Prepare build
         runs-on: ubuntu-22.04
         outputs:
-            version: ${{ steps.python-version.outputs.value }}
+            version: ${{ steps.version.outputs.version }}
             channel: ${{ steps.version.outputs.channel }}
         steps:
             - name: Checkout build repository
@@ -31,16 +31,18 @@ jobs:
                   commit_count="$(git rev-list --count --since=$midnight_timestamp HEAD)"
                   commit_count="$(printf "%02d" ${commit_count})"
                   version="${calver_date}${commit_count}"
+                else
+                  today="$(date --utc '+%Y-%m-%d')"
+                  midnight_timestamp="$(date --utc +%s --date=$today)"
+                  calver_date="$(date --utc --date=$today '+%Y.%-m.dev%-d')"
+                  # Remove invalid chars
+                  localversion="${version}"
+                  localversion="${localversion//-/}"
+                  localversion="${localversion//_/}"
+                  version="${calver_date}+${localversion}"
                 fi
+                echo "Building version $version"
                 echo "version=$version" >> "$GITHUB_OUTPUT"
-            - name: Find-and-replace strings
-              id: python-version
-              uses: mad9000/actions-find-and-replace-string@3
-              with:
-                source: ${{ steps.version.outputs.version }}
-                find: '-'
-                replace: '_'
-                replaceAll: true
             - name: Checkout CHIP SDK repository
               uses: actions/checkout@v3
               with:
@@ -60,7 +62,7 @@ jobs:
                   done
             - name: Bootstrap
               working-directory: ./project-chip
-              run: scripts/build/gn_bootstrap.sh
+              run: bash scripts/bootstrap.sh
             - name: ZAP Code pre-generation
               working-directory: ./project-chip
               run: scripts/run_in_build_env.sh "scripts/codepregen.py ./zzz_pregenerated/"
@@ -70,7 +72,7 @@ jobs:
             - name: Store Matter SDK as artifact
               uses: actions/upload-artifact@v3
               with:
-                name: matter-sdk-${{ env.matter_sdk_ref }}
+                name: matter-sdk-${{ github.run_id }}
                 path: ./project-chip.tar.zst
 
     build_linux_python_lib:
@@ -81,10 +83,10 @@ jobs:
             matrix:
                 arch:
                     - name: x86_64
-                      container: connectedhomeip/chip-build:0.7.0
+                      container: ghcr.io/project-chip/chip-build:1
                       runner: ubuntu-22.04
                     - name: aarch64
-                      container: agners/aarch64-chip-build:0.7.0
+                      container: docker.io/agners/aarch64-chip-build:1
                       runner: ARM64
 
         runs-on: ${{ matrix.arch.runner }}
@@ -106,18 +108,19 @@ jobs:
             - name: Restore Matter SDK from artifacts
               uses: actions/download-artifact@v3
               with:
-                name: matter-sdk-${{ env.matter_sdk_ref }}
+                name: matter-sdk-${{ github.run_id }}
             - name: Extract Matter SDK from tar
               working-directory: ./
               run: |
+                rm -rf project-chip
                 mkdir -p project-chip
                 cd project-chip
                 apt update && apt install zstd
                 tar -xaf ../project-chip.tar.zst --use-compress-program=zstdmt .
                 git config --global --add safe.directory "*"
                 rm -rf out/
             - name: Bootstrap
-              run: scripts/build/gn_bootstrap.sh
+              run: bash scripts/bootstrap.sh
             - name: Setup Build, Run Build and Run Tests
               run: |
                   scripts/build/gn_gen.sh --args=" \

0001-Support-custom-platform-tag.patch

@@ -1,5 +1,5 @@
-From c46f6cb84fb189da723a9932a5195a553762e2b6 Mon Sep 17 00:00:00 2001
-Message-Id: <c46f6cb84fb189da723a9932a5195a553762e2b6.1684832810[email protected]>
+From 7105b8d215750e60fc872af5d8c5903e61a806c9 Mon Sep 17 00:00:00 2001
+Message-ID: <7105b8d215750e60fc872af5d8c5903e61a806c9.1696858281[email protected]>
 From: Stefan Agner <[email protected]>
 Date: Tue, 22 Nov 2022 10:51:17 +0100
 Subject: [PATCH] Support custom platform tag
@@ -9,13 +9,13 @@ Subject: [PATCH] Support custom platform tag
  1 file changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn
-index 750de2b837..424ed433b1 100644
+index 4b84c63d5f..b01dafbc30 100644
 --- a/src/controller/python/BUILD.gn
 +++ b/src/controller/python/BUILD.gn
-@@ -33,6 +33,15 @@ config("controller_wno_deprecate") {
- declare_args() {
+@@ -35,6 +35,15 @@ declare_args() {
    chip_python_version = "0.0"
    chip_python_package_prefix = "chip"
+   chip_python_supports_stack_locking = chip_system_config_locking != "none"
 +
 +  if (current_os == "mac") {
 +    chip_python_platform_tag = string_replace(
@@ -28,7 +28,7 @@ index 750de2b837..424ed433b1 100644
  }
 
  shared_library("ChipDeviceCtrl") {
-@@ -326,16 +335,7 @@ chip_python_wheel_action("chip-core") {
+@@ -340,16 +349,7 @@ chip_python_wheel_action("chip-core") {
      cpu_tag = current_cpu
    }
 
@@ -47,5 +47,5 @@ index 750de2b837..424ed433b1 100644
    tags = "cp37-abi3-" + py_platform_tag
 
 -- 
-2.40.1
+2.42.0
 

0002-Use-data-as-platform-storage-location.patch

@@ -1,7 +1,7 @@
-From 5ec4046d098992d3b7b8a4fc46ceb4008a31da9d Mon Sep 17 00:00:00 2001
-Message-Id: <5ec4046d098992d3b7b8a4fc46ceb4008a31da9d.1684832810[email protected]>
-In-Reply-To: <c46f6cb84fb189da723a9932a5195a553762e2b6.1684832810[email protected]>
-References: <c46f6cb84fb189da723a9932a5195a553762e2b6.1684832810[email protected]>
+From 0099f338e0fb740bd4fb2f34b315bca918e9b257 Mon Sep 17 00:00:00 2001
+Message-ID: <0099f338e0fb740bd4fb2f34b315bca918e9b257.1696858281[email protected]>
+In-Reply-To: <7105b8d215750e60fc872af5d8c5903e61a806c9.1696858281[email protected]>
+References: <7105b8d215750e60fc872af5d8c5903e61a806c9.1696858281[email protected]>
 From: Stefan Agner <[email protected]>
 Date: Fri, 27 May 2022 16:38:14 +0200
 Subject: [PATCH] Use /data as platform storage location
@@ -11,7 +11,7 @@ Subject: [PATCH] Use /data as platform storage location
  1 file changed, 6 insertions(+)
 
 diff --git a/src/platform/Linux/BUILD.gn b/src/platform/Linux/BUILD.gn
-index 69d0289254..af10193504 100644
+index 56324ff5c4..066bde076a 100644
 --- a/src/platform/Linux/BUILD.gn
 +++ b/src/platform/Linux/BUILD.gn
 @@ -38,6 +38,12 @@ if (chip_mdns == "platform") {
@@ -28,5 +28,5 @@ index 69d0289254..af10193504 100644
      "../DeviceSafeQueue.cpp",
      "../DeviceSafeQueue.h",
 -- 
-2.40.1
+2.42.0