From 19d5e0961c22cdb5ed0c1f57d81ee832f7d48e77 Mon Sep 17 00:00:00 2001 From: Nerivec <62446222+Nerivec@users.noreply.github.com> Date: Fri, 28 Jun 2024 03:50:16 +0200 Subject: [PATCH] Update actions. Reorganize manifests. --- .github/workflows/build.yaml | 21 +++++++++---------- ... => aeotec_zga008_ncp-uart-hw_115200.yaml} | 0 ...syiot_zb-gw04-1v1_ncp-uart-sw_115200.yaml} | 0 ...syiot_zb-gw04-1v2_ncp-uart-hw_115200.yaml} | 0 ...bucasa_skyconnect_ncp-uart-hw_115200.yaml} | 0 ...bucasa_skyconnect_ncp-uart-sw_115200.yaml} | 0 ...> nabucasa_yellow_ncp-uart-hw_115200.yaml} | 0 ...> nabucasa_yellow_ncp-uart-sw_115200.yaml} | 0 ...> smlight_slzb06m_ncp-uart-sw_115200.yaml} | 0 ...=> smlight_slzb07_ncp-uart-hw_115200.yaml} | 0 ...=> smlight_slzb07_ncp-uart-sw_115200.yaml} | 0 ... sonoff_zbdonglee_ncp-uart-sw_115200.yaml} | 0 ... sparkfun_mgm240p_ncp-uart-sw_115200.yaml} | 0 ... => tubeszb_mgm24_ncp-uart-hw_115200.yaml} | 0 ...tubeszb_mgm24_ncp-uart-hw_115200_max.yaml} | 0 15 files changed, 10 insertions(+), 11 deletions(-) rename manifests/{aeotec/zga008_ncp-uart-hw_115200.yaml => aeotec_zga008_ncp-uart-hw_115200.yaml} (100%) rename manifests/{easyiot/zb-gw04-1v1_ncp-uart-sw_115200.yaml => easyiot_zb-gw04-1v1_ncp-uart-sw_115200.yaml} (100%) rename manifests/{easyiot/zb-gw04-1v2_ncp-uart-hw_115200.yaml => easyiot_zb-gw04-1v2_ncp-uart-hw_115200.yaml} (100%) rename manifests/{nabucasa/skyconnect_ncp-uart-hw_115200.yaml => nabucasa_skyconnect_ncp-uart-hw_115200.yaml} (100%) rename manifests/{nabucasa/skyconnect_ncp-uart-sw_115200.yaml => nabucasa_skyconnect_ncp-uart-sw_115200.yaml} (100%) rename manifests/{nabucasa/yellow_ncp-uart-hw_115200.yaml => nabucasa_yellow_ncp-uart-hw_115200.yaml} (100%) rename manifests/{nabucasa/yellow_ncp-uart-sw_115200.yaml => nabucasa_yellow_ncp-uart-sw_115200.yaml} (100%) rename manifests/{smlight/slzb06m_ncp-uart-sw_115200.yaml => smlight_slzb06m_ncp-uart-sw_115200.yaml} (100%) rename manifests/{smlight/slzb07_ncp-uart-hw_115200.yaml => smlight_slzb07_ncp-uart-hw_115200.yaml} (100%) rename manifests/{smlight/slzb07_ncp-uart-sw_115200.yaml => smlight_slzb07_ncp-uart-sw_115200.yaml} (100%) rename manifests/{sonoff/zbdonglee_ncp-uart-sw_115200.yaml => sonoff_zbdonglee_ncp-uart-sw_115200.yaml} (100%) rename manifests/{sparkfun/mgm240p_ncp-uart-sw_115200.yaml => sparkfun_mgm240p_ncp-uart-sw_115200.yaml} (100%) rename manifests/{tubeszb/mgm24_ncp-uart-hw_115200.yaml => tubeszb_mgm24_ncp-uart-hw_115200.yaml} (100%) rename manifests/{tubeszb/mgm24_ncp-uart-hw_115200_max.yaml => tubeszb_mgm24_ncp-uart-hw_115200_max.yaml} (100%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b066f0f4..020a1f79 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,8 +21,8 @@ jobs: name: Run pre-commit runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 - name: Install pre-commit run: | pip install pre-commit @@ -37,9 +37,9 @@ jobs: permissions: packages: write steps: - - uses: actions/checkout@v4.1.4 + - uses: actions/checkout@v4 - name: Log in to the GitHub container registry - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.repository_owner }} @@ -85,10 +85,10 @@ jobs: echo "image_name=$image_name" >> $GITHUB_OUTPUT echo "container_name=${{ env.REGISTRY }}/$image_name:$tag_name" >> $GITHUB_OUTPUT - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.3.0 + uses: docker/setup-buildx-action@v3 if: steps.read-repo-info.outputs.build_image == 'true' - name: Build and Push - uses: docker/build-push-action@v5.3.0 + uses: docker/build-push-action@v6 if: steps.read-repo-info.outputs.build_image == 'true' with: context: . @@ -102,14 +102,13 @@ jobs: image_name: ${{ steps.read-repo-info.outputs.image_name }} container_name: ${{ steps.read-repo-info.outputs.container_name }} - list-manifests: name: List firmware manifests runs-on: ubuntu-latest outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v4.1.4 + - uses: actions/checkout@v4 - id: set-matrix run: | echo "matrix=$(find manifests -type f \( -name "*.yaml" -o -name "*.yml" \) -print | sort | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT @@ -125,7 +124,7 @@ jobs: matrix: manifest: ${{ fromJson(needs.list-manifests.outputs.matrix) }} steps: - - uses: actions/checkout@v4.1.4 + - uses: actions/checkout@v4 - name: Install SDK extensions run: | @@ -181,7 +180,7 @@ jobs: apt-get install -y nodejs - name: Upload artifact - uses: actions/upload-artifact@v4.3.3 + uses: actions/upload-artifact@v4 with: name: firmware-build-${{ steps.build-firmware.outputs.output_basename }} path: outputs/* @@ -204,6 +203,6 @@ jobs: pattern: firmware-build-* - name: Upload artifacts - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: artifacts/*.gbl diff --git a/manifests/aeotec/zga008_ncp-uart-hw_115200.yaml b/manifests/aeotec_zga008_ncp-uart-hw_115200.yaml similarity index 100% rename from manifests/aeotec/zga008_ncp-uart-hw_115200.yaml rename to manifests/aeotec_zga008_ncp-uart-hw_115200.yaml diff --git a/manifests/easyiot/zb-gw04-1v1_ncp-uart-sw_115200.yaml b/manifests/easyiot_zb-gw04-1v1_ncp-uart-sw_115200.yaml similarity index 100% rename from manifests/easyiot/zb-gw04-1v1_ncp-uart-sw_115200.yaml rename to manifests/easyiot_zb-gw04-1v1_ncp-uart-sw_115200.yaml diff --git a/manifests/easyiot/zb-gw04-1v2_ncp-uart-hw_115200.yaml b/manifests/easyiot_zb-gw04-1v2_ncp-uart-hw_115200.yaml similarity index 100% rename from manifests/easyiot/zb-gw04-1v2_ncp-uart-hw_115200.yaml rename to manifests/easyiot_zb-gw04-1v2_ncp-uart-hw_115200.yaml diff --git a/manifests/nabucasa/skyconnect_ncp-uart-hw_115200.yaml b/manifests/nabucasa_skyconnect_ncp-uart-hw_115200.yaml similarity index 100% rename from manifests/nabucasa/skyconnect_ncp-uart-hw_115200.yaml rename to manifests/nabucasa_skyconnect_ncp-uart-hw_115200.yaml diff --git a/manifests/nabucasa/skyconnect_ncp-uart-sw_115200.yaml b/manifests/nabucasa_skyconnect_ncp-uart-sw_115200.yaml similarity index 100% rename from manifests/nabucasa/skyconnect_ncp-uart-sw_115200.yaml rename to manifests/nabucasa_skyconnect_ncp-uart-sw_115200.yaml diff --git a/manifests/nabucasa/yellow_ncp-uart-hw_115200.yaml b/manifests/nabucasa_yellow_ncp-uart-hw_115200.yaml similarity index 100% rename from manifests/nabucasa/yellow_ncp-uart-hw_115200.yaml rename to manifests/nabucasa_yellow_ncp-uart-hw_115200.yaml diff --git a/manifests/nabucasa/yellow_ncp-uart-sw_115200.yaml b/manifests/nabucasa_yellow_ncp-uart-sw_115200.yaml similarity index 100% rename from manifests/nabucasa/yellow_ncp-uart-sw_115200.yaml rename to manifests/nabucasa_yellow_ncp-uart-sw_115200.yaml diff --git a/manifests/smlight/slzb06m_ncp-uart-sw_115200.yaml b/manifests/smlight_slzb06m_ncp-uart-sw_115200.yaml similarity index 100% rename from manifests/smlight/slzb06m_ncp-uart-sw_115200.yaml rename to manifests/smlight_slzb06m_ncp-uart-sw_115200.yaml diff --git a/manifests/smlight/slzb07_ncp-uart-hw_115200.yaml b/manifests/smlight_slzb07_ncp-uart-hw_115200.yaml similarity index 100% rename from manifests/smlight/slzb07_ncp-uart-hw_115200.yaml rename to manifests/smlight_slzb07_ncp-uart-hw_115200.yaml diff --git a/manifests/smlight/slzb07_ncp-uart-sw_115200.yaml b/manifests/smlight_slzb07_ncp-uart-sw_115200.yaml similarity index 100% rename from manifests/smlight/slzb07_ncp-uart-sw_115200.yaml rename to manifests/smlight_slzb07_ncp-uart-sw_115200.yaml diff --git a/manifests/sonoff/zbdonglee_ncp-uart-sw_115200.yaml b/manifests/sonoff_zbdonglee_ncp-uart-sw_115200.yaml similarity index 100% rename from manifests/sonoff/zbdonglee_ncp-uart-sw_115200.yaml rename to manifests/sonoff_zbdonglee_ncp-uart-sw_115200.yaml diff --git a/manifests/sparkfun/mgm240p_ncp-uart-sw_115200.yaml b/manifests/sparkfun_mgm240p_ncp-uart-sw_115200.yaml similarity index 100% rename from manifests/sparkfun/mgm240p_ncp-uart-sw_115200.yaml rename to manifests/sparkfun_mgm240p_ncp-uart-sw_115200.yaml diff --git a/manifests/tubeszb/mgm24_ncp-uart-hw_115200.yaml b/manifests/tubeszb_mgm24_ncp-uart-hw_115200.yaml similarity index 100% rename from manifests/tubeszb/mgm24_ncp-uart-hw_115200.yaml rename to manifests/tubeszb_mgm24_ncp-uart-hw_115200.yaml diff --git a/manifests/tubeszb/mgm24_ncp-uart-hw_115200_max.yaml b/manifests/tubeszb_mgm24_ncp-uart-hw_115200_max.yaml similarity index 100% rename from manifests/tubeszb/mgm24_ncp-uart-hw_115200_max.yaml rename to manifests/tubeszb_mgm24_ncp-uart-hw_115200_max.yaml