From 53bc84ac3e38c2b266a8e03bb41e992410bd2ad3 Mon Sep 17 00:00:00 2001 From: Nerivec <62446222+Nerivec@users.noreply.github.com> Date: Tue, 29 Oct 2024 07:50:05 +0100 Subject: [PATCH] fix sdk_version too long. --- .github/workflows/build.yaml | 4 +--- tools/build_project.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2fa9706f..aa706f1e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -123,9 +123,7 @@ jobs: options: --user root strategy: matrix: - manifest: - - manifests/sonoff/sonoff_zbdonglee_zigbee_router.yaml - # manifest: ${{ fromJson(needs.list-manifests.outputs.matrix) }} + manifest: ${{ fromJson(needs.list-manifests.outputs.matrix) }} steps: - uses: actions/checkout@v4 diff --git a/tools/build_project.py b/tools/build_project.py index b166668d..cabbea05 100755 --- a/tools/build_project.py +++ b/tools/build_project.py @@ -419,7 +419,7 @@ def main(): # Set software date code to day of build f'(.endpointTypes[].clusters[].attributes[] | select(.name == "date code")).defaultValue = "{date_code}"', # Set software build ID to SDK version - f'(.endpointTypes[].clusters[].attributes[] | select(.name == "sw build id")).defaultValue = "{sdk_version}"', + f'(.endpointTypes[].clusters[].attributes[] | select(.name == "sw build id")).defaultValue = "{sdk_version.split(":", 1)[1]}"', # Set path f'(.package[] | select(.type == "zcl-properties")).path = "{sdk}/app/zcl/zcl-zap.json"', # Set path