From aaf4224dcdfaa7cb2fe1689efc4a54ef6f6c7255 Mon Sep 17 00:00:00 2001 From: mr-bump Date: Tue, 3 Oct 2023 20:19:37 +0000 Subject: [PATCH 1/3] Update gateway-rs to latest GA v1.2.1 --- settings.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.ini b/settings.ini index c691802e..31338898 100644 --- a/settings.ini +++ b/settings.ini @@ -1,7 +1,7 @@ [versions] -FIRMWARE_VERSION=v1.1.1 +FIRMWARE_VERSION=v1.2.1 DIAGNOSTICS_VERSION=95860ee CONFIG_VERSION=8e93fcc PKTFWD_VERSION=d9a70aa -GATEWAYRS_VERSION=c94b250 +GATEWAYRS_VERSION=0a78ab8 MULTIPLEXER_VERSION=a1fc09b From ae7ed17e3f6dd41b7043c92ed988da5dbb02e345 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Wed, 4 Oct 2023 00:06:36 +0100 Subject: [PATCH 2/3] Update requirements.txt (#886) * Update requirements.txt * Update test-requirements.txt * Update settings.ini * Update settings.ini * Update settings.ini --- requirements.txt | 2 +- settings.ini | 8 ++++---- test-requirements.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index d108279c..5b9e767b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ jinja2==3.1.2 grpcio==1.56.0 -hm-pyhelper==0.14.30 +hm-pyhelper==0.14.31 diff --git a/settings.ini b/settings.ini index 31338898..7c49c627 100644 --- a/settings.ini +++ b/settings.ini @@ -1,7 +1,7 @@ [versions] FIRMWARE_VERSION=v1.2.1 -DIAGNOSTICS_VERSION=95860ee -CONFIG_VERSION=8e93fcc -PKTFWD_VERSION=d9a70aa -GATEWAYRS_VERSION=0a78ab8 +DIAGNOSTICS_VERSION=d24559a +CONFIG_VERSION=2386553 +PKTFWD_VERSION=ee5b6b1 +GATEWAYRS_VERSION=b73b130 MULTIPLEXER_VERSION=a1fc09b diff --git a/test-requirements.txt b/test-requirements.txt index 81424e79..03a7fdef 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.30 +hm_pyhelper==0.14.31 From ea1e27c1227b2f0e5a29e0bb93d0f7a4bfb84756 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Wed, 4 Oct 2023 01:19:22 +0100 Subject: [PATCH 3/3] Update push-to-prod-nebraos-cloud-draft.yml (#887) * Update push-to-prod-nebraos-cloud-draft.yml * Update push-to-prod-nebraos-cloud.yml * Update push-to-testnet-nebraos-cloud-draft.yml * Update push-to-testnet-nebraos-cloud.yml * Update balena-app.yml * Update build-open-fleet.yml * Update update-action-prod.yml * Update update-action-test.yml --- .github/workflows/push-to-prod-nebraos-cloud-draft.yml | 2 +- .github/workflows/push-to-prod-nebraos-cloud.yml | 2 +- .github/workflows/push-to-testnet-nebraos-cloud-draft.yml | 2 +- .github/workflows/push-to-testnet-nebraos-cloud.yml | 2 +- balena/workflows/balena-app.yml | 2 +- balena/workflows/build-open-fleet.yml | 6 +++--- balena/workflows/update-action-prod.yml | 2 +- balena/workflows/update-action-test.yml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/push-to-prod-nebraos-cloud-draft.yml b/.github/workflows/push-to-prod-nebraos-cloud-draft.yml index d7a3aae9..627b43c8 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@v17.1.1 + uses: nebraltd/balena-cli-action@v16.7.0 with: balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}} balena_url: cloud.nebra.com diff --git a/.github/workflows/push-to-prod-nebraos-cloud.yml b/.github/workflows/push-to-prod-nebraos-cloud.yml index 6a6aac88..f6f6e2b6 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@v17.1.1 + uses: nebraltd/balena-cli-action@v16.7.0 with: balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}} balena_url: cloud.nebra.com diff --git a/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml b/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml index 7395e30f..9b6384cd 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@v17.1.1 + uses: nebraltd/balena-cli-action@v16.7.0 with: balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}} balena_url: cloud.nebra.com diff --git a/.github/workflows/push-to-testnet-nebraos-cloud.yml b/.github/workflows/push-to-testnet-nebraos-cloud.yml index 43a40528..b13ccef4 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@v17.1.1 + uses: nebraltd/balena-cli-action@v16.7.0 with: balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}} balena_url: cloud.nebra.com diff --git a/balena/workflows/balena-app.yml b/balena/workflows/balena-app.yml index fec18c1c..8a8eddf4 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@v17.1.1 + uses: nebraltd/balena-cli-action@v17.1.4 with: balena_api_token: ${{secrets.BALENA_API_TOKEN}} balena_command: "deploy nebraltd/helium-${{ env.miner }}-app --debug --nocache --build" diff --git a/balena/workflows/build-open-fleet.yml b/balena/workflows/build-open-fleet.yml index a9bd9615..75b45150 100644 --- a/balena/workflows/build-open-fleet.yml +++ b/balena/workflows/build-open-fleet.yml @@ -6,9 +6,9 @@ on: workflow_dispatch: env: - balena-cli: v17.1.1 - raspberrypi3-64: 4.0.7 - raspberrypi4-64: 4.0.7 + balena-cli: v16.7.0 + raspberrypi3-64: 4.0.16+rev1 + raspberrypi4-64: 4.0.7+rev3 raspberrypicm4-ioboard: 2.112.12 rockpi-4b-rk3399: 2.108.25+rev1 balena-bobcat-px30-image: 2023.07.17 diff --git a/balena/workflows/update-action-prod.yml b/balena/workflows/update-action-prod.yml index f5b0d075..052cfdcf 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@v17.1.1 + uses: nebraltd/balena-cli-action@v17.1.4 with: balena_api_token: ${{secrets.BALENA_API_TOKEN}} balena_command: "deploy ${{ env.fleet }} --debug --nocache --build" diff --git a/balena/workflows/update-action-test.yml b/balena/workflows/update-action-test.yml index 8452aeeb..241ac489 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@v17.1.1 + uses: nebraltd/balena-cli-action@v17.1.4 with: balena_api_token: ${{secrets.BALENA_API_TOKEN}} balena_command: "deploy ${{ env.fleet }} --debug --nocache --build"