From 6aacd1b445af97027d23547db1379c854c638119 Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Thu, 16 Jan 2025 22:42:17 -0500 Subject: [PATCH 1/5] Rename build to main.yaml --- .github/workflows/{buld.yaml => main.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{buld.yaml => main.yaml} (100%) diff --git a/.github/workflows/buld.yaml b/.github/workflows/main.yaml similarity index 100% rename from .github/workflows/buld.yaml rename to .github/workflows/main.yaml From c0e6df67ac656a9049ee3ba130de24df37fc29f2 Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Thu, 16 Jan 2025 22:45:46 -0500 Subject: [PATCH 2/5] Use shared container builder workflow --- .github/workflows/main.yaml | 49 ++++++------------------------------- 1 file changed, 7 insertions(+), 42 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c76b609..4a24f48 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -1,7 +1,7 @@ # The entire pipeline was shamelessy borrowed from https://github.com/NabuCasa/silabs-firmware-builder # Kudos to NabuCasa and Stefan -name: Silicon Labs builder +name: Project Build Trigger on: workflow_dispatch: @@ -27,53 +27,18 @@ on: tags: - '*' -env: - sdk_version: ${{ - vars.sdk_version != '' - && vars.sdk_version - || '4.4.5' - }} - gcc_version: ${{ vars.gcc_version != '' && vars.gcc_version || '12.3.rel1' }} - zap_version: ${{ vars.zap_version != '' && vars.zap_version || 'v2024.12.13' }} jobs: build-container: name: Create build container image - runs-on: ubuntu-latest permissions: packages: write - outputs: - sdk_version: ${{ env.sdk_version }} - image_name: ghcr.io/${{ steps.lower.outputs.repository_owner }}/silabs-project-builder:${{ env.sdk_version }} - steps: - - name: Repository owner lowercase - id: lower - run: | - echo "repository_owner=$(echo $GITHUB_REPOSITORY_OWNER | tr [:upper:] [:lower:])" >> $GITHUB_OUTPUT - - - uses: actions/checkout@v4 - - - name: Log in to the GitHub container registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Build and Push - uses: docker/build-push-action@v6 - with: - context: . - file: Dockerfile - tags: ghcr.io/${{ steps.lower.outputs.repository_owner }}/silabs-project-builder:${{ env.sdk_version }} - cache-from: ghcr.io/${{ steps.lower.outputs.repository_owner }}/silabs-project-builder:cache-${{ env.sdk_version }}-${{ env.gcc_version }}-${{ env.zap_version}} - cache-to: ghcr.io/${{ steps.lower.outputs.repository_owner }}/silabs-project-builder:cache-${{ env.sdk_version }}-${{ env.gcc_version }}-${{ env.zap_version}} - push: true - build-args: - "GECKO_SDK_VERSION=v${{ env.sdk_version }}" + contents: write + uses: zha-ng/workflows-silabs/.github/workflows/build-gsdk-container.yaml@v1 + with: + sdk_version: "4.4.5" + gcc_version: 12.3.rel1 + zap_version: v2024.12.13 app-btl-build: From 92d2f70fda87c28c47900c1377c5b754c26b32fd Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Thu, 16 Jan 2025 22:59:22 -0500 Subject: [PATCH 3/5] Use shared SLC build workflow --- .github/workflows/app-btl-build.yaml | 160 ++++---- .github/workflows/silabs-project-builder.yaml | 349 ------------------ 2 files changed, 65 insertions(+), 444 deletions(-) delete mode 100644 .github/workflows/silabs-project-builder.yaml diff --git a/.github/workflows/app-btl-build.yaml b/.github/workflows/app-btl-build.yaml index 8895931..47dac61 100644 --- a/.github/workflows/app-btl-build.yaml +++ b/.github/workflows/app-btl-build.yaml @@ -43,14 +43,33 @@ on: jobs: app-firmware-build: - name: Zigbee Torch App - uses: ./.github/workflows/silabs-project-builder.yaml + if: ${{ !inputs.build_btl }} + name: Zigbee Torch App (no bootloader) + strategy: + fail-fast: false + matrix: + include: + - name_suffix: debug + + - name_suffix: end-device + without: >- + debug_swo + configuration: >- + SL_ZIGBEE_DEBUG_STACK_GROUP_ENABLED_DEFAULT:0, + SL_ZIGBEE_DEBUG_CORE_GROUP_ENABLED_DEFAULT:0, + SL_ZIGBEE_DEBUG_APP_GROUP_ENABLED_DEFAULT:1, + SL_ZIGBEE_DEBUG_ZCL_GROUP_ENABLED_DEFAULT:0 + + uses: zha-ng/workflows-silabs/.github/workflows/slc-project-builder.yaml@v1 with: image_name: ${{ inputs.image_name }} - project_name: TBS2Torch + src_project: TBS2Torch + project_name: TBS2Torch-${{ matrix.name_suffix }} device: ${{ inputs.device }} components: ${{ inputs.board }} + remove_components: ${{ matrix.without }} configuration: | + ${{ matrix.configuration }}, SL_IOSTREAM_USART_VCOM_RX_BUFFER_SIZE:32 extra_c_defs: "" sdk_version: ${{ inputs.sdk_version }} @@ -59,15 +78,55 @@ jobs: ota_string: ${{ inputs.app_ota_string }} sdk_extensions: | "https://github.com/Adminiuga/Raz1_custom_components_extension" + + + app-btl-firmware-build: + if: ${{ inputs.build_btl }} + needs: [ bootloader-build ] + name: Zigbee Torch App (with bootloader) + strategy: + fail-fast: false + matrix: + include: + - name_suffix: debug + + - name_suffix: end-device + without: >- + debug_swo + configuration: >- + SL_ZIGBEE_DEBUG_STACK_GROUP_ENABLED_DEFAULT:0, + SL_ZIGBEE_DEBUG_CORE_GROUP_ENABLED_DEFAULT:0, + SL_ZIGBEE_DEBUG_APP_GROUP_ENABLED_DEFAULT:1, + SL_ZIGBEE_DEBUG_ZCL_GROUP_ENABLED_DEFAULT:0 + + uses: zha-ng/workflows-silabs/.github/workflows/slc-project-builder.yaml@v1 + with: + image_name: ${{ inputs.image_name }} + src_project: TBS2Torch + project_name: TBS2Torch-${{ matrix.name_suffix }} + device: ${{ inputs.device }} + components: ${{ inputs.board }} + remove_components: ${{ matrix.without }} + configuration: | + ${{ matrix.configuration }}, + SL_IOSTREAM_USART_VCOM_RX_BUFFER_SIZE:32 + extra_c_defs: "" + sdk_version: ${{ inputs.sdk_version }} + sdkpatchpath: "patches/GeckoSDK" + metadata_extra: "{}" + ota_string: ${{ inputs.app_ota_string }} + sdk_extensions: | + "https://github.com/Adminiuga/Raz1_custom_components_extension" + with_bootloader: ${{ needs.bootloader-build.outputs.project_name }} bootloader-build: if: inputs.build_btl name: Application bootloader - uses: ./.github/workflows/silabs-project-builder.yaml + uses: zha-ng/workflows-silabs/.github/workflows/slc-project-builder.yaml@v1 with: image_name: ${{ inputs.image_name }} - project_name: >- + src_project: >- ${{ vars.btl_project_name != '' && vars.btl_project_name || 'bootloader-storage-spiflash-single' @@ -82,7 +141,7 @@ jobs: ) }} - export_project_name: "TBS2Torch_btl" + project_name: "TBS2Torch_btl" device: ${{ inputs.device }} components: > ${{ inputs.board != '' && format('{0},', inputs.board) || '' }} @@ -103,92 +162,3 @@ jobs: sdk_version: ${{ inputs.sdk_version }} sdkpatchpath: '' metadata_extra: "{}" - - - bootloader-ota: - if: inputs.build_btl - needs: - - app-firmware-build - - bootloader-build - name: Create OTA with bootloader - runs-on: ubuntu-latest - container: - image: ${{ inputs.image_name }} - options: --user root - defaults: - run: - shell: su --shell=/bin/bash builder {0} - - env: - ota_version: ${{ needs.app-firmware-build.outputs.ota_version }} - app_artifact_name: ${{ needs.app-firmware-build.outputs.artifact_name }} - app_project_name: ${{ needs.app-firmware-build.outputs.project_name }} - btl_artifact_name: ${{ needs.bootloader-build.outputs.artifact_name }} - btl_project_name: ${{ needs.bootloader-build.outputs.project_name }} - - steps: - - uses: actions/download-artifact@v4 - name: Download App firmware - with: - name: ${{ env.app_artifact_name }} - path: ${{ env.app_artifact_name }} - - - uses: actions/download-artifact@v4 - name: Download bootloader build - with: - name: ${{ env.btl_artifact_name }} - path: ${{ env.btl_artifact_name }} - - - name: Adjust permission - shell: bash - run: chown -R builder . - - - name: Read App firmware version metadata - id: app_meta - shell: bash - run: | - cd ${{ env.app_artifact_name }} - echo "ota_image_type_id=$(cat version.json | jq .ota_image_type_id)" >> "$GITHUB_OUTPUT" - echo "manufacturer_id=$(cat version.json | jq .manufacturer_id)" >> "$GITHUB_OUTPUT" - - - name: Read Bootloader firmware version metadata - id: btl_meta - shell: bash - run: | - cd ${{ env.btl_artifact_name }} - echo "bootloader_version=$(cat version.json | jq .bootloader_version)" \ - >> "$GITHUB_OUTPUT" - - - name: Create GBL and OTA with bootloader - run: | - cd ${{ env.btl_artifact_name }} - commander gbl create "${{ env.app_project_name }}-btl.gbl" \ - --app "../${{ env.app_artifact_name }}/${{ env.app_project_name }}.hex" \ - --bootloader "${{ env.btl_project_name }}-crc.s37" \ - --compress lzma \ - --device ${{ inputs.device }} \ - --metadata "../${{ env.app_artifact_name }}/version.json" - - OTA_FN="${{ env.app_project_name }}-${{ env.ota_version }}-btl" - /gecko_sdk/protocol/zigbee/tool/image-builder/image-builder-linux \ - --create "$OTA_FN-v${{ steps.btl_meta.outputs.bootloader_version }}.ota" \ - --version ${{ env.ota_version }} \ - ${{ inputs.app_ota_string != '' - && format('--string "{0}" \', inputs.app_ota_string) - || '\' - }} - --image-type ${{ steps.app_meta.outputs.ota_image_type_id }} \ - --manuf-id ${{ steps.app_meta.outputs.manufacturer_id }} \ - --tag-id 0x0000 \ - --tag-file "${{ env.app_project_name }}-btl.gbl" - - - uses: actions/upload-artifact@v4 - name: Upload bootloader & bootloader OTA image artifact - with: - name: ${{ env.btl_project_name }} - overwrite: true - path: | - ${{ env.btl_project_name }}/version.json - ${{ env.btl_project_name }}/*.gbl - ${{ env.btl_project_name }}/*.s37 - ${{ env.btl_project_name }}/*.ota \ No newline at end of file diff --git a/.github/workflows/silabs-project-builder.yaml b/.github/workflows/silabs-project-builder.yaml deleted file mode 100644 index 5ece4c8..0000000 --- a/.github/workflows/silabs-project-builder.yaml +++ /dev/null @@ -1,349 +0,0 @@ -# The entire pipeline was shamelessy borrowed from https://github.com/NabuCasa/silabs-firmware-builder -# Kudos to Stefan and NabuCasa - -name: SLC Project Builder - -on: - workflow_call: - inputs: - image_name: - required: false - type: string - default: "ghcr.io/${{ github.repository_owner }}/silabs-project-builder:${{ inputs.sdk_version }}" - - export_project_name: - required: false - type: string - default: '' - - project_name: - required: true - type: string - - src_project_path: - description: "Source path of the project. defaults to $GITHUB_WORKSPACE" - required: false - type: string - - components: - required: false - type: string - - configuration: - required: false - type: string - - sdkpatchpath: - required: false - type: string - - extra_c_defs: - required: false - type: string - - sdk_version: - required: true - type: string - - device: - required: true - type: string - - metadata_extra: - required: false - default: "null" - type: string - - ota_string: - required: false - description: OTA string to add into ota file header - default: '' - type: string - - sdk_extensions: - required: false - description: 'List of SDK extensions git URLs. an URL with #tag_name will use a specific tag/branch name' - default: '' - type: string - - outputs: - project_name: - description: Name of the generated SLC project - value: ${{ jobs.firmware-build.outputs.project_name }} - - artifact_name: - description: Artifact name for the uploaded firmware - value: ${{ jobs.firmware-build.outputs.artifact_name }} - - ota_version: - description: OTA version - value: ${{ jobs.firmware-build.outputs.ota_version }} - - -env: - PROJECT_NAME: ${{ inputs.export_project_name == '' && inputs.project_name || inputs.export_project_name }} - IS_NEW_PROJECT: ${{ inputs.export_project_name != '' && 'yes' || 'no' }} - IS_BTL: ${{ startsWith(inputs.project_name, 'bootloader') && 'yes' || '' }} - branch_to_ota: >- - ${{ ( github.ref_name == 'main' || (startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, 'rc')) ) - && '9' - || ( (startsWith(github.ref_name, 'rc') || (startsWith(github.ref, 'refs/tags/v') && contains(github.ref, 'rc'))) - && '7' - || ( github.ref_name == 'dev' - && '5' - || '4') - ) - }} - branch_to_build_type: >- - ${{ github.ref_name == 'main' - && 'rel' - || (startsWith(github.ref_name, 'rc') - && 'rc' - || ( github.ref_name == 'dev' - && 'dev' - || 'unk') - ) - }} - sdk_path: /gecko_sdk - -jobs: - firmware-build: - name: Build '${{ inputs.PROJECT_NAME }}' Project - runs-on: ubuntu-latest - container: - image: ${{ inputs.image_name }} - options: --user root - defaults: - run: - shell: su --shell=/bin/bash builder {0} - outputs: - project_name: ${{ env.PROJECT_NAME }} - artifact_name: ${{ env.PROJECT_NAME }} - ota_version: ${{ steps.ota_version.outputs.ota_version }} - - steps: - - uses: actions/checkout@v4 - - name: Adjust permission - shell: bash - run: chown -R builder . - - - name: Install the SDK Extenstions - if: ${{ inputs.sdk_extensions != '' }} - shell: bash - run: | - mkdir -p ${{ env.sdk_path }}/extension || true - cd ${{ env.sdk_path }}/extension - for EXT in ${{ inputs.sdk_extensions }} - do - if [[ "$EXT" == *#* ]] - then - URL="${EXT%%#*}" - TAG="${EXT#*#}" - echo "Clonining ${URL} with '${TAG}' tag" - git clone --depth 1 -b "${TAG}" "$URL" - else - EXT=$(echo $EXT | cut -d'#' -f1) - echo "Clonining ${EXT}" - git clone --depth 1 "$EXT" - fi - done - - - name: Trust SDK Extenstions - if: ${{ inputs.sdk_extensions != '' }} - run: | - for EXT_PATH in ${{ env.sdk_path }}/extension/* - do - echo "Trusting ${EXT_PATH}" - slc signature trust -extpath "$EXT_PATH" - done - - - name: Generate OTA Version - id: ota_version - shell: bash - run: | - git config --global --add safe.directory "$GITHUB_WORKSPACE" - LC_TIME=C META_DATE=$(git log -1 --format="%cd" --date=format:"%Y%m%d") - LC_TIME=C OTA_DATE=$(git log -1 --format="%cd" --date=format:"%y%m%d") - BUILD_ID_MOD100=$(printf '%02d' $(expr $GITHUB_RUN_NUMBER % 100)) # 100 builds per day only - OTA_VERSION="${OTA_DATE}${{ env.branch_to_ota }}${BUILD_ID_MOD100}" - echo "OTA version: '${OTA_VERSION}'" - echo "OTA_VERSION=${OTA_VERSION}" >> "$GITHUB_OUTPUT" - echo "BUILD_DATE=${META_DATE}" >> "$GITHUB_OUTPUT" - echo "BUILD_ID_MOD100=${BUILD_ID_MOD100}" >> "$GITHUB_OUTPUT" - - - name: Update dateCode in ZAP config - if: ${{ env.IS_BTL != 'yes' }} - run: | - cd "${{ env.PROJECT_NAME }}/config/zcl" - cp "zcl_config.zap" "zcl_config.zap~" - FILTER='(. | .endpointTypes[].clusters[] | select(.name == "Basic") | .attributes[] | select(.code == 6)).defaultValue' - DATE_CODE="${{ steps.ota_version.outputs.BUILD_DATE}}.${{ env.branch_to_build_type }}.${{ steps.ota_version.outputs.BUILD_ID_MOD100 }}" - echo "Date Code = '${DATE_CODE}'" - jq "${FILTER} |= \"${DATE_CODE}\"" "zcl_config.zap~" > "zcl_config.zap" - - - name: Update SWBuildId in ZAP config - if: ${{ env.IS_BTL != 'yes' }} - run: | - cd "${{ env.PROJECT_NAME }}/config/zcl" - cp "zcl_config.zap" "zcl_config.zap~" - FILTER='(. | .endpointTypes[].clusters[] | select(.name == "Basic") | .attributes[] | select(.code == 16384)).defaultValue' - SW_BUILD_ID="SHA1: $(echo ${{ github.sha }} | cut -c1-10)" - echo "Date Code = '${SW_BUILD_ID}'" - jq "${FILTER} |= \"${SW_BUILD_ID}\"" "zcl_config.zap~" > "zcl_config.zap" - - - name: Generate New Project - if: env.IS_NEW_PROJECT == 'yes' - run: | - slc generate \ - --with="${{ inputs.device }},${{ inputs.components }}" \ - --project-file="${{ inputs.src_project_path }}/${{ inputs.project_name }}/${{ inputs.project_name }}.slcp" \ - --export-destination="$(pwd)/${{ inputs.export_project_name }}" \ - --project-name="${{ inputs.export_project_name }}" \ - --new-project \ - --force \ - --copy-proj-sources --copy-sdk-sources \ - --configuration="${{ inputs.configuration }}" - - - name: Generate Existing Project - if: env.IS_NEW_PROJECT != 'yes' - run: | - slc generate \ - --with="${{ inputs.device }},${{ inputs.components }}" \ - --project-file="$(pwd)/${{ inputs.project_name }}/${{ inputs.project_name }}.slcp" \ - --force \ - --copy-sdk-sources \ - --configuration="${{ inputs.configuration }}" - - - name: Patch SDK - if: "${{ inputs.sdkpatchpath != '' }}" - run: | - cd ${{ env.PROJECT_NAME }}/gecko_sdk_${{ inputs.sdk_version }} - for patch in $(find "../../${{ inputs.sdkpatchpath }}" -maxdepth 0 -name *.patch) - do - echo "Applying ${patch}" - test -r $patch && patch -p1 < $patch - done - - - name: Update OTA version - if: ${{ env.IS_BTL != 'yes' }} - run: | - cd ${{ env.PROJECT_NAME }}/config - sed -i -E \ - 's/^(#define\s+EMBER_AF_PLUGIN_OTA_CLIENT_POLICY_FIRMWARE_VERSION)\s+[0-9]+\s*$/\1 ${{ steps.ota_version.outputs.ota_version }}/' \ - ota-client-policy-config.h - - - name: Build Firmware - run: | - cd ${{ env.PROJECT_NAME }} - make -f ${{ env.PROJECT_NAME }}.Makefile release - - - name: Get Bootloader version - if: ${{ env.IS_BTL == 'yes' }} - shell: bash - run: | - cd ${{ env.PROJECT_NAME }} - BTL_VERSION=$(awk \ - '/#define BOOTLOADER_VERSION_MAIN_CUSTOMER/ \ - {print $NF; exit}' \ - config/btl_core_cfg.h) - echo "Bootloader Customer Version: $BTL_VERSION" - echo "BOOTLOADER_VERSION=$BTL_VERSION" >> "$GITHUB_ENV" - - - name: Get OTA image type and manufacturer id - if: ${{ env.IS_BTL != 'yes' }} - shell: bash - run: | - cd ${{ env.PROJECT_NAME }} - OTA_IMAGE_TYPE_ID=$(awk \ - '/#define EMBER_AF_PLUGIN_OTA_CLIENT_POLICY_IMAGE_TYPE_ID/ \ - {print $NF; exit}' \ - config/ota-client-policy-config.h) - OTA_MANUFACTURER_ID=$(awk \ - '/#define EMBER_AF_MANUFACTURER_CODE/ \ - {print $NF; exit}' \ - autogen/zap-config.h) - echo "OTA Manufacturer ID: $OTA_MANUFACTURER_ID" - echo "OTA Image Type ID: $OTA_IMAGE_TYPE_ID" - echo "OTA_IMAGE_TYPE_ID=$OTA_IMAGE_TYPE_ID" >> "$GITHUB_ENV" - echo "OTA_MANUFACTURER_ID=$OTA_MANUFACTURER_ID" >> "$GITHUB_ENV" - - - name: Add Firmware Metadata - run: | - cd ${{ env.PROJECT_NAME }} - jq --null-input \ - '{ - "metadata_version": 1, - "sdk_version": "${{ inputs.sdk_version }}", - ${{ env.IS_BTL != 'yes' - && format('"ota_version": "{0}", - "ota_image_type_id": "{1}", - "manufacturer_id": "{2}",', - steps.ota_version.outputs.ota_version, - env.OTA_IMAGE_TYPE_ID, - env.OTA_MANUFACTURER_ID) - || format('"bootloader_version": "{0}",', - env.BOOTLOADER_VERSION) - }} - "workflow_run": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id}}", - "commit": "${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}", - "branch": "${{ github.server_url }}/${{ github.repository }}/tree/${{ github.ref_name }}", - "commit_sha": "${{ github.sha }}" - } + ${{ inputs.metadata_extra }}' > ${{ - env.IS_BTL != 'yes' - && 'build/release/version.json' - || 'artifact/version.json' - }} - - - name: Generate gbl Firmware - if: ${{ env.IS_BTL != 'yes' }} - run: | - cd ${{ env.PROJECT_NAME }} - commander gbl create build/release/${{ env.PROJECT_NAME }}.gbl \ - --app build/release/${{ env.PROJECT_NAME }}.hex \ - --compress lzma \ - --device ${{ inputs.device }} --metadata build/release/version.json - - - name: Generate OTA Image - if: ${{ env.IS_BTL != 'yes' }} - run: | - cd ${{ env.PROJECT_NAME }}/build/release - /gecko_sdk/protocol/zigbee/tool/image-builder/image-builder-linux \ - --create "${{ env.PROJECT_NAME }}-${{ steps.ota_version.outputs.ota_version }}.ota" \ - --version ${{ steps.ota_version.outputs.ota_version }} \ - ${{ inputs.ota_string != '' - && format('--string "{0}" \', inputs.ota_string) - || '\' - }} - --image-type ${{ env.OTA_IMAGE_TYPE_ID }} \ - --manuf-id ${{ env.OTA_MANUFACTURER_ID }} \ - --tag-id 0x0000 \ - --tag-file "${{ env.PROJECT_NAME}}.gbl" - - - uses: actions/upload-artifact@v4 - if: (success() || failure()) && env.IS_BTL != 'yes' - name: Upload application firmware - with: - name: ${{ env.PROJECT_NAME }} - path: | - ${{ env.PROJECT_NAME }}/build/release/version.json - ${{ env.PROJECT_NAME }}/build/release/*.gbl - ${{ env.PROJECT_NAME }}/build/release/*.hex - ${{ env.PROJECT_NAME }}/build/release/*.ota - - - uses: actions/upload-artifact@v4 - if: (success() || failure()) && env.IS_BTL == 'yes' - name: Upload bootloader firmware - with: - name: ${{ env.PROJECT_NAME }} - path: | - ${{ env.PROJECT_NAME }}/artifact/version.json - ${{ env.PROJECT_NAME }}/artifact/*.s37 - - - uses: actions/upload-artifact@v4 - if: (success() || failure()) && vars.ARTIFACT_UPLOAD_SOURCES != '' - name: Upload generated project sources - with: - name: ${{ env.PROJECT_NAME }}-Sources - path: | - ${{ env.PROJECT_NAME }} - !${{ env.PROJECT_NAME }}/build/** \ No newline at end of file From 8699747f20b191653e07c9282ab56dc5af8894cc Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Thu, 16 Jan 2025 23:02:56 -0500 Subject: [PATCH 4/5] Update triggers --- .github/workflows/main.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 4a24f48..e528e29 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -15,9 +15,8 @@ on: push: paths: - Dockerfile - - .github/workflows/build.yaml + - .github/workflows/main.yaml - .github/workflows/app-btl-build.yaml - - .github/workflows/silabs-project-builder.yaml - 'TBS2Torch/**' - 'patches/**' branches: @@ -27,6 +26,9 @@ on: tags: - '*' + pull_request: + types: [opened, reopened, synchronize] + jobs: build-container: From d457f932aa71dd9fa0855ed49d99641cdf90a95c Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Thu, 16 Jan 2025 23:08:44 -0500 Subject: [PATCH 5/5] Remove the Readme --- TBS2Torch/TBS2Torch.slcp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/TBS2Torch/TBS2Torch.slcp b/TBS2Torch/TBS2Torch.slcp index d95cf21..38b7ec7 100644 --- a/TBS2Torch/TBS2Torch.slcp +++ b/TBS2Torch/TBS2Torch.slcp @@ -14,8 +14,6 @@ filter: value: [Zigbee] package: Zigbee quality: production -readme: -- {path: readme.html} source: - {path: main.c} - {path: app.c} @@ -171,10 +169,6 @@ configuration: - name: SL_BATTERY_MONITOR_R_DIVIDER_R2 value: 2700 condition: [power_configuration_server] -ui_hints: - highlight: - - {path: '', focus: true} - - {path: readme.html} sdk_extension: - {id: raz1_custom_components, version: 0.0.2}