From a86c15f740f4081fb105282cd80bda44a58c6627 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:18:37 +0400 Subject: [PATCH 01/19] Update balena.yml.linxdot-rkcm3 --- balena/balena.yml.linxdot-rkcm3 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/balena/balena.yml.linxdot-rkcm3 b/balena/balena.yml.linxdot-rkcm3 index 08cfc837..15115c74 100644 --- a/balena/balena.yml.linxdot-rkcm3 +++ b/balena/balena.yml.linxdot-rkcm3 @@ -1,7 +1,7 @@ -name: nebra-helium-linxdot-rkcm3 +name: nebra-helium-linxdot-rk3566 type: sw.application description: >- - Manage your Linxdot ROCK CM3 Helium Miner remotely using Nebra and balenaCloud. + Manage your Linxdot RK3566 Helium Miner remotely using Nebra and balenaCloud. post-provisioning: >- ## Usage instructions @@ -9,7 +9,7 @@ post-provisioning: >- Once your device joins the fleet you'll need to allow some time for it to download the application and start forwarding packets to the Helium Network. - For detailed instructions on how to use Nebra Helium Linxdot ROCK CM3 check out [our GitHub repo](https://github.com/NebraLtd/helium-linxdot-rkcm3). + For detailed instructions on how to use Nebra Helium Linxdot RK3566 check out [our GitHub repo](https://github.com/NebraLtd/helium-linxdot-rk3566). For support you can [open an issue](https://github.com/NebraLtd/helium-linxdot-rkcm3/issues) on the repo or reach out to us via one of the methods listed [on our support page](https://helium.nebra.com). @@ -17,7 +17,7 @@ assets: repository: type: blob.asset data: - url: "https://github.com/NebraLtd/helium-linxdot-rkcm3" + url: "https://github.com/NebraLtd/helium-linxdot-rk3566" logo: type: blob.asset data: @@ -26,10 +26,10 @@ assets: data: applicationEnvironmentVariables: - FREQ: "N/A (Non Nebra Miner)" - - VARIANT: COMP-LINXDOTRKCM3 + - VARIANT: COMP-LINXDOTRK3566 applicationConfigVariables: - RESIN_OVERRIDE_LOCK: 1 - defaultDeviceType: rockpicm3-ioboard + defaultDeviceType: nanopc-t4 supportedDeviceTypes: - - rockpicm3-ioboard + - nanopc-t4 version: 0.0.1 From 1645bf8a1f86d46894c167e3725c9e1a2658d3b4 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:20:14 +0400 Subject: [PATCH 02/19] Update and rename balena.yml.linxdot-rkcm3 to balena.yml.linxdot-rk3566 --- balena/{balena.yml.linxdot-rkcm3 => balena.yml.linxdot-rk3566} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename balena/{balena.yml.linxdot-rkcm3 => balena.yml.linxdot-rk3566} (97%) diff --git a/balena/balena.yml.linxdot-rkcm3 b/balena/balena.yml.linxdot-rk3566 similarity index 97% rename from balena/balena.yml.linxdot-rkcm3 rename to balena/balena.yml.linxdot-rk3566 index 15115c74..6e72b6d9 100644 --- a/balena/balena.yml.linxdot-rkcm3 +++ b/balena/balena.yml.linxdot-rk3566 @@ -29,7 +29,7 @@ data: - VARIANT: COMP-LINXDOTRK3566 applicationConfigVariables: - RESIN_OVERRIDE_LOCK: 1 - defaultDeviceType: nanopc-t4 + defaultDeviceType: linxdot-rk3566 supportedDeviceTypes: - nanopc-t4 version: 0.0.1 From 8d1d0142d9826b6e197769f7fb62362fac3cd1c4 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:21:32 +0400 Subject: [PATCH 03/19] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f169d820..d108279c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ jinja2==3.1.2 grpcio==1.56.0 -hm-pyhelper==0.14.25 +hm-pyhelper==0.14.30 From 97d26d5ba1637807d33b00cb8f0aa56deb93cdf6 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:21:49 +0400 Subject: [PATCH 04/19] Update test-requirements.txt --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 459494dd..81424e79 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,4 +3,4 @@ bandit==1.7.5 pytest==7.4.0 pytest-cov==4.1.0 grpcio==1.56.0 -hm_pyhelper==0.14.22 +hm_pyhelper==0.14.30 From 64464a321c53945ebc7cf2f4c90dfac0f3dcc4a3 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:32:53 +0400 Subject: [PATCH 05/19] Update openfleet-file-update.yml --- .github/workflows/openfleet-file-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openfleet-file-update.yml b/.github/workflows/openfleet-file-update.yml index f4b15c85..b5f89a47 100644 --- a/.github/workflows/openfleet-file-update.yml +++ b/.github/workflows/openfleet-file-update.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - sbc: [hnt_openfleet_template, nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566] + sbc: [hnt_openfleet_template, nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rk3566, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566] steps: - name: Generate repo name run: | From b52023af9434bae57a0494f3ab191bd48a6d487e Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:33:33 +0400 Subject: [PATCH 06/19] Update push-to-prod-nebraos-cloud-draft.yml --- .github/workflows/push-to-prod-nebraos-cloud-draft.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-to-prod-nebraos-cloud-draft.yml b/.github/workflows/push-to-prod-nebraos-cloud-draft.yml index dc6264d5..59eb75d5 100644 --- a/.github/workflows/push-to-prod-nebraos-cloud-draft.yml +++ b/.github/workflows/push-to-prod-nebraos-cloud-draft.yml @@ -10,7 +10,7 @@ jobs: max-parallel: 1 fail-fast: false matrix: - sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566] + sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rk3566, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566] steps: - name: Checkout From 1b02b2776acf7d41030b5f86958bd51823503abe Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:33:54 +0400 Subject: [PATCH 07/19] Update push-to-prod-nebraos-cloud.yml --- .github/workflows/push-to-prod-nebraos-cloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-to-prod-nebraos-cloud.yml b/.github/workflows/push-to-prod-nebraos-cloud.yml index b5967cb1..940a65f4 100644 --- a/.github/workflows/push-to-prod-nebraos-cloud.yml +++ b/.github/workflows/push-to-prod-nebraos-cloud.yml @@ -16,7 +16,7 @@ jobs: max-parallel: 1 fail-fast: false matrix: - sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566] + sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rk3566, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566] steps: - name: Checkout From 9eb9322937edeee9873ef949d111ca7ded7eef6c Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:34:21 +0400 Subject: [PATCH 08/19] Update push-to-testnet-nebraos-cloud-draft.yml --- .github/workflows/push-to-testnet-nebraos-cloud-draft.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml b/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml index 9920fbe7..358d6f53 100644 --- a/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml +++ b/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml @@ -10,7 +10,7 @@ jobs: max-parallel: 1 fail-fast: false matrix: - sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rkcm3, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566] + sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rk3566, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566] steps: - name: Checkout uses: actions/checkout@v3 From 3f77cbd933b524209f2317f28986c4e081ba7426 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:34:43 +0400 Subject: [PATCH 09/19] Update push-to-testnet-nebraos-cloud.yml --- .github/workflows/push-to-testnet-nebraos-cloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-to-testnet-nebraos-cloud.yml b/.github/workflows/push-to-testnet-nebraos-cloud.yml index 655b2a64..4284b73f 100644 --- a/.github/workflows/push-to-testnet-nebraos-cloud.yml +++ b/.github/workflows/push-to-testnet-nebraos-cloud.yml @@ -16,7 +16,7 @@ jobs: max-parallel: 1 fail-fast: false matrix: - sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rkcm3, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566] + sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rk3566, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566] steps: - name: Checkout uses: actions/checkout@v3 From dc8c4c23e61ec4d6c9c81e114bdfefa48c92a6a8 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:48:56 +0400 Subject: [PATCH 10/19] Update build-open-fleet.yml --- balena/workflows/build-open-fleet.yml | 29 +++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/balena/workflows/build-open-fleet.yml b/balena/workflows/build-open-fleet.yml index 1642888c..a9bd9615 100644 --- a/balena/workflows/build-open-fleet.yml +++ b/balena/workflows/build-open-fleet.yml @@ -6,15 +6,17 @@ on: workflow_dispatch: env: - balena-cli: v16.7.6 - raspberrypi3-64: 3.1.12 - raspberrypi4-64: 3.1.12 + balena-cli: v17.1.1 + raspberrypi3-64: 4.0.7 + raspberrypi4-64: 4.0.7 raspberrypicm4-ioboard: 2.112.12 rockpi-4b-rk3399: 2.108.25+rev1 balena-bobcat-px30-image: 2023.07.17 bobcat-px30: 2.115.3 balena-bobcat-rk3566-image: 2023.08.15 bobcat-rk3566: 2.115.3 + balena-linxdot-rk3566-image: 2023.08.15 + linxdot-rk3566: 2.115.3 cloud: nebra-cloud jobs: @@ -155,6 +157,16 @@ jobs: target: 'images/balena-base-${{ github.event.repository.name }}.img.zip' token: ${{ secrets.MR_BUMP }} + - name: Download Linxdot RK3566 base Balena OS image + uses: dsaltares/fetch-gh-release-asset@master + if: github.event.repository.name == 'helium-linxdot-rk3566' && env.BRANCH == 'master' + with: + repo: 'NebraLtd/balena-linxdot-rk3566' + version: 'tags/${{ env.balena-linxdot-rk3566-image }}' + file: 'balena-image-linxdot-rk3566-${{ env.balena-linxdot-rk3566-image }}.img.zip' + target: 'images/balena-base-${{ github.event.repository.name }}.img.zip' + token: ${{ secrets.MR_BUMP }} + - name: Generate a Balena OS image for the given board, variant, frequency if: env.BRANCH == 'master' run: | @@ -204,6 +216,9 @@ jobs: elif [ ${{ github.event.repository.name }} == 'helium-bobcat-rk3566' ] ; then balena_os="rockpro64" balena_os_version="${{ env.bobcat-rk3566 }}" + elif [ ${{ github.event.repository.name }} == 'helium-linxdot-rk3566' ] ; then + balena_os="nanopc-t4" + balena_os_version="${{ env.linxdot-rk3566 }}" elif [ ${{ env.ROCKPI }} == 'YES' ] ; then balena_os="rockpi-4b-rk3399" balena_os_version="${{ env.rockpi-4b-rk3399 }}" @@ -219,7 +234,7 @@ jobs: fi if $NODRYRUN ; then - if [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] && [ ${{ github.event.repository.name }} != 'helium-bobcat-rk3566' ]; then + if [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] && [ ${{ github.event.repository.name }} != 'helium-bobcat-rk3566' ] && [ ${{ github.event.repository.name }} != 'helium-linxdot-rk3566' ]; then # Download the base image balena os download "$balena_os" \ -o "$base_image_path" \ @@ -281,7 +296,7 @@ jobs: fi if $NODRYRUN ; then - if [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] && [ ${{ github.event.repository.name }} != 'helium-bobcat-rk3566' ]; then + if [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] && [ ${{ github.event.repository.name }} != 'helium-bobcat-rk3566' ] && [ ${{ github.event.repository.name }} != 'helium-linxdot-rk3566' ]; then balena os configure "$image_path" \ --fleet "nebraltd/$fleet_name" \ --config-network ethernet \ @@ -315,7 +330,7 @@ jobs: sudo balena config inject $final_json_filename --drive "$image_path" fi - if [ ${{ github.event.repository.name }} == 'helium-bobcat-px30' ] || [ ${{ github.event.repository.name }} == 'helium-bobcat-rk3566' ]; then + if [ ${{ github.event.repository.name }} == 'helium-bobcat-px30' ] || [ ${{ github.event.repository.name }} == 'helium-bobcat-rk3566' ] || [ ${{ github.event.repository.name }} == 'helium-linxdot-rk3566' ]; then # Overwrite device type from bobcat specific to balena specific if $VERBOSE ; then echo "Overwriting device-type" @@ -331,6 +346,8 @@ jobs: sudo sed -i 's/"slug": "bobcat-px30"/"slug": "isg-503"/' ${tmpdir}/device-type.json elif [ ${{ github.event.repository.name }} == 'helium-bobcat-rk3566' ]; then sudo sed -i 's/"slug": "bobcat-rk3566"/"slug": "rockpro64"/' ${tmpdir}/device-type.json + elif [ ${{ github.event.repository.name }} == 'helium-linxdot-rk3566' ]; then + sudo sed -i 's/"slug": "linxdot-rk3566"/"slug": "nanopc-t4"/' ${tmpdir}/device-type.json fi sudo umount ${tmpdir} From 1ecc2822aef7b9856c8bb57f477992c38d7042f7 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:57:58 +0400 Subject: [PATCH 11/19] Update balena-app.yml --- balena/workflows/balena-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/balena/workflows/balena-app.yml b/balena/workflows/balena-app.yml index 26a1e25c..fec18c1c 100644 --- a/balena/workflows/balena-app.yml +++ b/balena/workflows/balena-app.yml @@ -19,7 +19,7 @@ jobs: - name: Random sleep (balena API workaround) run: sleep $[ ( $RANDOM % 600 ) + 1 ]s - name: Balena Deploy - uses: nebraltd/balena-cli-action@v16.7.6 + uses: nebraltd/balena-cli-action@v17.1.1 with: balena_api_token: ${{secrets.BALENA_API_TOKEN}} balena_command: "deploy nebraltd/helium-${{ env.miner }}-app --debug --nocache --build" From f7896346b0db5c9d4f0f3d7946e7463b61a21e97 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:58:31 +0400 Subject: [PATCH 12/19] Update update-action-prod.yml --- balena/workflows/update-action-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/balena/workflows/update-action-prod.yml b/balena/workflows/update-action-prod.yml index e32e0791..f5b0d075 100644 --- a/balena/workflows/update-action-prod.yml +++ b/balena/workflows/update-action-prod.yml @@ -59,7 +59,7 @@ jobs: - name: Balena Deploy if: env.LATEST == 'FALSE' - uses: nebraltd/balena-cli-action@v16.7.6 + uses: nebraltd/balena-cli-action@v17.1.1 with: balena_api_token: ${{secrets.BALENA_API_TOKEN}} balena_command: "deploy ${{ env.fleet }} --debug --nocache --build" From 80763e632686c022f6cfa0badf8fa5502cb4b1e6 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 19:58:53 +0400 Subject: [PATCH 13/19] Update update-action-test.yml --- balena/workflows/update-action-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/balena/workflows/update-action-test.yml b/balena/workflows/update-action-test.yml index 7a16b0f7..8452aeeb 100644 --- a/balena/workflows/update-action-test.yml +++ b/balena/workflows/update-action-test.yml @@ -59,7 +59,7 @@ jobs: - name: Balena Deploy if: env.LATEST == 'FALSE' - uses: nebraltd/balena-cli-action@v16.7.6 + uses: nebraltd/balena-cli-action@v17.1.1 with: balena_api_token: ${{secrets.BALENA_API_TOKEN}} balena_command: "deploy ${{ env.fleet }} --debug --nocache --build" From cd18b2d399e3bff96bfea38b27a23649e2c79745 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 20:02:17 +0400 Subject: [PATCH 14/19] Update push-to-prod-nebraos-cloud-draft.yml --- .github/workflows/push-to-prod-nebraos-cloud-draft.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-to-prod-nebraos-cloud-draft.yml b/.github/workflows/push-to-prod-nebraos-cloud-draft.yml index 59eb75d5..d7a3aae9 100644 --- a/.github/workflows/push-to-prod-nebraos-cloud-draft.yml +++ b/.github/workflows/push-to-prod-nebraos-cloud-draft.yml @@ -59,7 +59,7 @@ jobs: python gen_docker_compose_by_variant.py "$variant" -o docker-compose.yml - name: Balena Deploy - uses: nebraltd/balena-cli-action@v16.7.6 + uses: nebraltd/balena-cli-action@v17.1.1 with: balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}} balena_url: cloud.nebra.com From bba70e35e359285a03b9190a1208bd1bdf9574e9 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 20:02:37 +0400 Subject: [PATCH 15/19] Update push-to-prod-nebraos-cloud.yml --- .github/workflows/push-to-prod-nebraos-cloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-to-prod-nebraos-cloud.yml b/.github/workflows/push-to-prod-nebraos-cloud.yml index 940a65f4..6a6aac88 100644 --- a/.github/workflows/push-to-prod-nebraos-cloud.yml +++ b/.github/workflows/push-to-prod-nebraos-cloud.yml @@ -65,7 +65,7 @@ jobs: python gen_docker_compose_by_variant.py "$variant" -o docker-compose.yml - name: Balena Deploy - uses: nebraltd/balena-cli-action@v16.7.6 + uses: nebraltd/balena-cli-action@v17.1.1 with: balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}} balena_url: cloud.nebra.com From b41c19ecbdd02649b5744bebb70430ac6b851e3d Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 20:03:33 +0400 Subject: [PATCH 16/19] Update push-to-testnet-nebraos-cloud-draft.yml --- .github/workflows/push-to-testnet-nebraos-cloud-draft.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml b/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml index 358d6f53..7395e30f 100644 --- a/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml +++ b/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml @@ -83,7 +83,7 @@ jobs: fi - name: Balena Deploy - uses: nebraltd/balena-cli-action@v16.7.6 + uses: nebraltd/balena-cli-action@v17.1.1 with: balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}} balena_url: cloud.nebra.com From fb9b7abb923175f825dc765762deea514dbc64d6 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Fri, 15 Sep 2023 20:05:27 +0400 Subject: [PATCH 17/19] Update push-to-testnet-nebraos-cloud.yml --- .github/workflows/push-to-testnet-nebraos-cloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-to-testnet-nebraos-cloud.yml b/.github/workflows/push-to-testnet-nebraos-cloud.yml index 4284b73f..43a40528 100644 --- a/.github/workflows/push-to-testnet-nebraos-cloud.yml +++ b/.github/workflows/push-to-testnet-nebraos-cloud.yml @@ -89,7 +89,7 @@ jobs: fi - name: Balena Deploy - uses: nebraltd/balena-cli-action@v16.7.6 + uses: nebraltd/balena-cli-action@v17.1.1 with: balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}} balena_url: cloud.nebra.com From 88b7a71c5f4a95ee261fa8777719f1a47ae709b4 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Sat, 16 Sep 2023 13:17:59 +0400 Subject: [PATCH 18/19] Update balena.yml.linxdot-rk3566 --- balena/balena.yml.linxdot-rk3566 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/balena/balena.yml.linxdot-rk3566 b/balena/balena.yml.linxdot-rk3566 index 6e72b6d9..7e79b159 100644 --- a/balena/balena.yml.linxdot-rk3566 +++ b/balena/balena.yml.linxdot-rk3566 @@ -12,7 +12,7 @@ post-provisioning: >- For detailed instructions on how to use Nebra Helium Linxdot RK3566 check out [our GitHub repo](https://github.com/NebraLtd/helium-linxdot-rk3566). - For support you can [open an issue](https://github.com/NebraLtd/helium-linxdot-rkcm3/issues) on the repo or reach out to us via one of the methods listed [on our support page](https://helium.nebra.com). + For support you can [open an issue](https://github.com/NebraLtd/helium-linxdot-rk3566/issues) on the repo or reach out to us via one of the methods listed [on our support page](https://helium.nebra.com). assets: repository: type: blob.asset From fad61bee4ccfbc07169d9f625a6de9eba2a718e3 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Sat, 16 Sep 2023 13:22:32 +0400 Subject: [PATCH 19/19] Update update-files.yml --- balena/workflows/update-files.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/balena/workflows/update-files.yml b/balena/workflows/update-files.yml index 3cc9eb9e..5033a9b8 100644 --- a/balena/workflows/update-files.yml +++ b/balena/workflows/update-files.yml @@ -46,7 +46,7 @@ jobs: wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.syncrobit -O config.txt elif [ $miner == 'risinghf' ] ; then wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.risinghf -O config.txt - elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] || [ $miner == 'bobcat-rk3566' ] ; then + elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rk3566' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] || [ $miner == 'bobcat-rk3566' ] ; then echo "No config.txt file needed - not RasPi based." else wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.rak -O config.txt @@ -105,7 +105,7 @@ jobs: wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.syncrobit -O config.txt elif [ $miner == 'risinghf' ] ; then wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.risinghf -O config.txt - elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] || [ $miner == 'bobcat-rk3566' ] ; then + elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rk3566' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] || [ $miner == 'bobcat-rk3566' ] ; then echo "No config.txt file needed - not RasPi based." else wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.rak -O config.txt