Update OpenFleet core files (production)

NebraLtd · Jan 20, 2023 · 14476ec · 14476ec
1 parent 61fd823
commit 14476ec
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 20 deletions.
diff --git a/.github/workflows/build-open-fleet.yml b/.github/workflows/build-open-fleet.yml
@@ -6,11 +6,11 @@ on:
   workflow_dispatch:
 
 env:
-  balena-cli: v15.0.0
-  raspberrypi3-64: 2022.10.0
-  raspberrypi4-64: 2022.10.0
+  balena-cli: v15.0.2
+  raspberrypi3-64: 2023.1.0
+  raspberrypi4-64: 2023.1.0
   raspberrypicm4-ioboard: 2.88.4+rev0
-  rockpi-4b-rk3399: 2022.4.2
+  rockpi-4b-rk3399: 2023.1.0
 
 jobs:
   build-open-fleet:
@@ -44,12 +44,15 @@ jobs:
           else
             echo "Not RasPi 3"
             RASPI3="NO"
-            
+            ROCKPI="NO"
           fi
 
           echo "RASPI3=$RASPI3" >> $GITHUB_ENV
           echo "ROCKPI=$ROCKPI" >> $GITHUB_ENV
 
+      - name: Random sleep (balena API workaround)
+        run:  sleep $[ ( $RANDOM % 540 ) + 1 ]s
+
       - name: Install latest balena-cli (raspi 3)
         if: env.RASPI3 == 'YES'
         run: |
@@ -79,7 +82,16 @@ jobs:
           cd ~
 
       - name: Balena login
-        run: balena login --token ${{ secrets.BALENA_API_TOKEN }} > /dev/null
+        run: |
+          if [ ${{ env.RASPI3 }} == 'YES' ] ; then
+            balena login --token ${{ secrets.BALENA_API_TOKEN }} > /dev/null
+          elif [ ${{ github.event.repository.name }} == 'helium-syncrobit' ] || [ ${{ github.event.repository.name }} == 'helium-linxdot' ] || [ ${{ github.event.repository.name }} == 'helium-pycom' ] ; then
+            balena login --token ${{ secrets.BALENA_API_TOKEN_2 }} > /dev/null
+          elif [ ${{ env.ROCKPI }} == 'YES' ] ; then
+            balena login --token ${{ secrets.BALENA_API_TOKEN_3 }} > /dev/null
+          else
+            balena login --token ${{ secrets.BALENA_API_TOKEN_4 }} > /dev/null
+          fi
 
       - name: Generate a Balena OS image for the given board, variant, frequency
         run: |

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,13 +3,13 @@ version: '2'
 services:
 
   gateway-config:
-    image: nebraltd/hm-config:81a7cf2
+    image: nebraltd/hm-config:6551c38
     depends_on:
       - dbus-session
       - diagnostics
     environment:
-      - FIRMWARE_VERSION=2022.12.13.0-3
-      - FIRMWARE_SHORT_HASH=4dd9b87
+      - FIRMWARE_VERSION=2022.12.13.0-10
+      - FIRMWARE_SHORT_HASH=641fc13
       - DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
       - DBUS_SESSION_BUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
     privileged: true
@@ -26,16 +26,16 @@ services:
     stop_signal: SIGINT
 
   packet-forwarder:
-    image: nebraltd/hm-pktfwd:0b5ee97
+    image: nebraltd/hm-pktfwd:7713945
     depends_on:
       - helium-miner
     restart: always
     privileged: true
     volumes:
       - pktfwdr:/var/pktfwd
     environment:
-      - FIRMWARE_VERSION=2022.12.13.0-3
-      - FIRMWARE_SHORT_HASH=4dd9b87
+      - FIRMWARE_VERSION=2022.12.13.0-10
+      - FIRMWARE_SHORT_HASH=641fc13
 
   helium-miner:
     image: nebraltd/hm-miner:arm64-c1f8791
@@ -59,17 +59,17 @@ services:
     restart: on-failure
     environment:
       - DBUS_SYSTEM_BUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
-      - FIRMWARE_VERSION=2022.12.13.0-3
-      - FIRMWARE_SHORT_HASH=4dd9b87
+      - FIRMWARE_VERSION=2022.12.13.0-10
+      - FIRMWARE_SHORT_HASH=641fc13
 
   diagnostics:
-    image: nebraltd/hm-diag:716a91a
+    image: nebraltd/hm-diag:1af64d2
     depends_on:
       - dbus-session
     environment:
-      - FIRMWARE_VERSION=2022.12.13.0-3
-      - FIRMWARE_SHORT_HASH=4dd9b87
-      - DIAGNOSTICS_VERSION=716a91a
+      - FIRMWARE_VERSION=2022.12.13.0-10
+      - FIRMWARE_SHORT_HASH=641fc13
+      - DIAGNOSTICS_VERSION=1af64d2
       - DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
     volumes:
       - pktfwdr:/var/pktfwd
@@ -99,8 +99,8 @@ services:
       - dbus:/session/dbus
     environment:
       - DBUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
-      - FIRMWARE_VERSION=2022.12.13.0-3
-      - FIRMWARE_SHORT_HASH=4dd9b87
+      - FIRMWARE_VERSION=2022.12.13.0-10
+      - FIRMWARE_SHORT_HASH=641fc13
 
 volumes:
   miner-storage: