Merge pull request #899 from NebraLtd/master

merge wingbits to production
NebraLtd · Jul 5, 2024 · 646ed6e · 646ed6e
2 parents c2dd87a + af71d27
commit 646ed6e
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 38 deletions.
diff --git a/.github/workflows/build-open-fleets.yml b/.github/workflows/build-open-fleets.yml
@@ -17,7 +17,7 @@ jobs:
           echo "FLEET=$FLEET" >> $GITHUB_ENV
 
       - name: Trigger build action in ${{ env.REPO }} repo
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.MR_BUMP }}
           event-type: build-open-fleet

diff --git a/.github/workflows/commercial-file-update.yml b/.github/workflows/commercial-file-update.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger PR action in commercial-hotspot-software repo
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.MR_BUMP }}
           event-type: file-update

diff --git a/.github/workflows/commercial-settings-update.yml b/.github/workflows/commercial-settings-update.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger PR action in commercial-hotspot-software repo
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.MR_BUMP }}
           event-type: settings-update

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -36,7 +36,7 @@ jobs:
       # Checkout the code base #
       ##########################
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Full git history is needed to get a proper list of changed files within `super-linter`
           fetch-depth: 0
@@ -45,7 +45,7 @@ jobs:
       # Run Linter against code base #
       ################################
       - name: Lint Code Base
-        uses: github/super-linter/slim@v4
+        uses: github/super-linter/slim@v6
         env:
           VALIDATE_ALL_CODEBASE: true
           VALIDATE_PYTHON_FLAKE8: true

diff --git a/.github/workflows/openfleet-file-update.yml b/.github/workflows/openfleet-file-update.yml
@@ -27,7 +27,7 @@ jobs:
           echo "FLEET=$FLEET" >> $GITHUB_ENV
          
       - name: Trigger PR action in ${{ env.FLEET }} repo
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.MR_BUMP }}
           event-type: file-update

diff --git a/.github/workflows/push-to-prod-nebraos-cloud-draft.yml b/.github/workflows/push-to-prod-nebraos-cloud-draft.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: production
 
@@ -59,14 +59,14 @@ jobs:
           python gen_docker_compose_by_variant.py "$variant" -o docker-compose.yml
 
       - name: Balena Deploy
-        uses: nebraltd/[email protected].0
+        uses: nebraltd/[email protected].6
         with:
           balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
           balena_url: cloud.nebra.com
           balena_command: "deploy nebraltd/${{ env.REPO }} --debug --nocache --build --draft"
 
       - name: Upload docker-compose.yml artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker-compose.yml.${{ env.REPO }}
           path: docker-compose.yml
@@ -82,7 +82,7 @@ jobs:
           body: "This is helium-miner-software release ${{ env.LATEST_GA }}-${{ env.day }}"
 
       - name: Trigger build action in ${{ env.REPO }} repo
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.MR_BUMP }}
           event-type: build-open-fleet

diff --git a/.github/workflows/push-to-prod-nebraos-cloud.yml b/.github/workflows/push-to-prod-nebraos-cloud.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: production
 
@@ -65,14 +65,14 @@ jobs:
           python gen_docker_compose_by_variant.py "$variant" -o docker-compose.yml
 
       - name: Balena Deploy
-        uses: nebraltd/[email protected].0
+        uses: nebraltd/[email protected].6
         with:
           balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
           balena_url: cloud.nebra.com
           balena_command: "deploy nebraltd/${{ env.REPO }} --debug --nocache --build"
 
       - name: Upload docker-compose.yml artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker-compose.yml.${{ env.REPO }}
           path: docker-compose.yml
@@ -88,7 +88,7 @@ jobs:
           body: "This is helium-miner-software release ${{ env.LATEST_GA }}-${{ env.day }}"
 
       - name: Trigger build action in ${{ env.REPO }} repo
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.MR_BUMP }}
           event-type: build-open-fleet

diff --git a/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml b/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml
@@ -13,7 +13,7 @@ jobs:
         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
+        uses: actions/checkout@v4
 
       - name: Setup Python Libraries
         run: pip install -r requirements.txt
@@ -83,21 +83,21 @@ jobs:
           fi
 
       - name: Balena Deploy
-        uses: nebraltd/[email protected].0
+        uses: nebraltd/[email protected].6
         with:
           balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
           balena_url: cloud.nebra.com
           balena_command: "deploy nebraltd/${{ env.FLEET }} --debug --nocache --build --draft"
 
       - name: Upload docker-compose.yml artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker-compose.yml.${{ env.REPO }}.testnet
           path: docker-compose.yml
 
       - name: Upload docker-compose.yml artifact (repo2)
         if: env.REPO2 != 'None'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker-compose.yml.${{ env.REPO2 }}.testnet
           path: docker-compose.yml.${{ env.REPO2 }}
@@ -124,15 +124,15 @@ jobs:
           body: "TESTNET: This is helium-miner-software release TESTNET-${{ env.LATEST_GA }}-${{ env.day }}"
 
       - name: Trigger build action in ${{ env.REPO }} repo
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.MR_BUMP }}
           event-type: build-open-fleet
           repository: NebraLtd/${{ env.REPO }}
           client-payload: '{"release": "${{ env.LATEST_GA }}_GA", "tag": "${{ env.LATEST_GA }}", "firmware": "${{ env.FIRMWARE_SHORT_HASH }}", "branch": "${{ env.GITHUB_BRANCH }}"}'
 
       - name: Trigger build action in ${{ env.REPO2 }} repo
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         if: matrix.sbc == 'raspi' || matrix.sbc == 'rockpi'
         with:
           token: ${{ secrets.MR_BUMP }}

diff --git a/.github/workflows/push-to-testnet-nebraos-cloud.yml b/.github/workflows/push-to-testnet-nebraos-cloud.yml
@@ -19,7 +19,7 @@ jobs:
         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
+        uses: actions/checkout@v4
 
       - name: Setup Python Libraries
         run: pip install -r requirements.txt
@@ -89,21 +89,21 @@ jobs:
           fi
 
       - name: Balena Deploy
-        uses: nebraltd/[email protected].0
+        uses: nebraltd/[email protected].6
         with:
           balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
           balena_url: cloud.nebra.com
           balena_command: "deploy nebraltd/${{ env.FLEET }} --debug --nocache --build"
 
       - name: Upload docker-compose.yml artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker-compose.yml.${{ env.REPO }}.testnet
           path: docker-compose.yml
 
       - name: Upload docker-compose.yml artifact (repo2)
         if: env.REPO2 != 'None'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker-compose.yml.${{ env.REPO2 }}.testnet
           path: docker-compose.yml.${{ env.REPO2 }}
@@ -130,15 +130,15 @@ jobs:
           body: "TESTNET: This is helium-miner-software release TESTNET-${{ env.LATEST_GA }}-${{ env.day }}"
 
       - name: Trigger build action in ${{ env.REPO }} repo
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.MR_BUMP }}
           event-type: build-open-fleet
           repository: NebraLtd/${{ env.REPO }}
           client-payload: '{"release": "${{ env.LATEST_GA }}_GA", "tag": "${{ env.LATEST_GA }}", "firmware": "${{ env.FIRMWARE_SHORT_HASH }}", "branch": "${{ env.GITHUB_BRANCH }}"}'
 
       - name: Trigger build action in ${{ env.REPO2 }} repo
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         if: matrix.sbc == 'raspi' || matrix.sbc == 'rockpi'
         with:
           token: ${{ secrets.MR_BUMP }}

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -4,12 +4,12 @@ on: [push, pull_request]
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Run PyTest

diff --git a/.github/workflows/security-audit.yml b/.github/workflows/security-audit.yml
@@ -5,12 +5,12 @@ on: [push, pull_request]
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Run bandit against code base

diff --git a/.github/workflows/update-gatewayrs.yml b/.github/workflows/update-gatewayrs.yml
@@ -6,7 +6,7 @@ jobs:
   gatewayrs-update:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
       - run: |
@@ -20,7 +20,7 @@ jobs:
           sed -i -E "s/FIRMWARE_VERSION=.*/FIRMWARE_VERSION=$LATEST_GA/g" settings.ini
           sed -i -E "s/GATEWAYRS_VERSION=.*/GATEWAYRS_VERSION=$SHORT_SHA/g" settings.ini
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: Update gateway-rs to latest GA ${{ env.LATEST_GA }}
           branch: gatewayrs-bump/${{ env.LATEST_GA }}

diff --git a/.github/workflows/update-production.yml b/.github/workflows/update-production.yml
@@ -10,7 +10,7 @@ jobs:
     if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
           fetch-depth: 0

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-jinja2==3.1.2
+jinja2==3.1.4
 grpcio==1.56.0
 hm-pyhelper==0.14.32
diff --git a/settings.ini b/settings.ini
@@ -1,6 +1,6 @@
 [versions]
-FIRMWARE_VERSION=v1.3.0
-DIAGNOSTICS_VERSION=6d56740
+FIRMWARE_VERSION=v1.3.1
+DIAGNOSTICS_VERSION=96a66c1
 CONFIG_VERSION=a198b83
 PKTFWD_VERSION=5c3c90a
 GATEWAYRS_VERSION=5428419