Skip to content

Commit 646ed6e

Browse files
shawajshawaj
authored
Merge pull request #899 from NebraLtd/master
merge wingbits to production
2 parents c2dd87a + af71d27 commit 646ed6e

15 files changed

+38
-38
lines changed

‎.github/workflows/build-open-fleets.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
echo "FLEET=$FLEET" >> $GITHUB_ENV
1818
1919
- name: Trigger build action in ${{ env.REPO }} repo
20-
uses: peter-evans/repository-dispatch@v2
20+
uses: peter-evans/repository-dispatch@v3
2121
with:
2222
token: ${{ secrets.MR_BUMP }}
2323
event-type: build-open-fleet

‎.github/workflows/commercial-file-update.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Trigger PR action in commercial-hotspot-software repo
15-
uses: peter-evans/repository-dispatch@v2
15+
uses: peter-evans/repository-dispatch@v3
1616
with:
1717
token: ${{ secrets.MR_BUMP }}
1818
event-type: file-update

‎.github/workflows/commercial-settings-update.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Trigger PR action in commercial-hotspot-software repo
15-
uses: peter-evans/repository-dispatch@v2
15+
uses: peter-evans/repository-dispatch@v3
1616
with:
1717
token: ${{ secrets.MR_BUMP }}
1818
event-type: settings-update

‎.github/workflows/linter.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
# Checkout the code base #
3737
##########################
3838
- name: Checkout Code
39-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
4040
with:
4141
# Full git history is needed to get a proper list of changed files within `super-linter`
4242
fetch-depth: 0
@@ -45,7 +45,7 @@ jobs:
4545
# Run Linter against code base #
4646
################################
4747
- name: Lint Code Base
48-
uses: github/super-linter/slim@v4
48+
uses: github/super-linter/slim@v6
4949
env:
5050
VALIDATE_ALL_CODEBASE: true
5151
VALIDATE_PYTHON_FLAKE8: true

‎.github/workflows/openfleet-file-update.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo "FLEET=$FLEET" >> $GITHUB_ENV
2828
2929
- name: Trigger PR action in ${{ env.FLEET }} repo
30-
uses: peter-evans/repository-dispatch@v2
30+
uses: peter-evans/repository-dispatch@v3
3131
with:
3232
token: ${{ secrets.MR_BUMP }}
3333
event-type: file-update

‎.github/workflows/push-to-prod-nebraos-cloud-draft.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
ref: production
2020

@@ -59,14 +59,14 @@ jobs:
5959
python gen_docker_compose_by_variant.py "$variant" -o docker-compose.yml
6060
6161
- name: Balena Deploy
62-
uses: nebraltd/[email protected].0
62+
uses: nebraltd/[email protected].6
6363
with:
6464
balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
6565
balena_url: cloud.nebra.com
6666
balena_command: "deploy nebraltd/${{ env.REPO }} --debug --nocache --build --draft"
6767

6868
- name: Upload docker-compose.yml artifact
69-
uses: actions/upload-artifact@v3
69+
uses: actions/upload-artifact@v4
7070
with:
7171
name: docker-compose.yml.${{ env.REPO }}
7272
path: docker-compose.yml
@@ -82,7 +82,7 @@ jobs:
8282
body: "This is helium-miner-software release ${{ env.LATEST_GA }}-${{ env.day }}"
8383

8484
- name: Trigger build action in ${{ env.REPO }} repo
85-
uses: peter-evans/repository-dispatch@v2
85+
uses: peter-evans/repository-dispatch@v3
8686
with:
8787
token: ${{ secrets.MR_BUMP }}
8888
event-type: build-open-fleet

‎.github/workflows/push-to-prod-nebraos-cloud.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
with:
2525
ref: production
2626

@@ -65,14 +65,14 @@ jobs:
6565
python gen_docker_compose_by_variant.py "$variant" -o docker-compose.yml
6666
6767
- name: Balena Deploy
68-
uses: nebraltd/[email protected].0
68+
uses: nebraltd/[email protected].6
6969
with:
7070
balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
7171
balena_url: cloud.nebra.com
7272
balena_command: "deploy nebraltd/${{ env.REPO }} --debug --nocache --build"
7373

7474
- name: Upload docker-compose.yml artifact
75-
uses: actions/upload-artifact@v3
75+
uses: actions/upload-artifact@v4
7676
with:
7777
name: docker-compose.yml.${{ env.REPO }}
7878
path: docker-compose.yml
@@ -88,7 +88,7 @@ jobs:
8888
body: "This is helium-miner-software release ${{ env.LATEST_GA }}-${{ env.day }}"
8989

9090
- name: Trigger build action in ${{ env.REPO }} repo
91-
uses: peter-evans/repository-dispatch@v2
91+
uses: peter-evans/repository-dispatch@v3
9292
with:
9393
token: ${{ secrets.MR_BUMP }}
9494
event-type: build-open-fleet

‎.github/workflows/push-to-testnet-nebraos-cloud-draft.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rk3566, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566]
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717

1818
- name: Setup Python Libraries
1919
run: pip install -r requirements.txt
@@ -83,21 +83,21 @@ jobs:
8383
fi
8484
8585
- name: Balena Deploy
86-
uses: nebraltd/[email protected].0
86+
uses: nebraltd/[email protected].6
8787
with:
8888
balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
8989
balena_url: cloud.nebra.com
9090
balena_command: "deploy nebraltd/${{ env.FLEET }} --debug --nocache --build --draft"
9191

9292
- name: Upload docker-compose.yml artifact
93-
uses: actions/upload-artifact@v3
93+
uses: actions/upload-artifact@v4
9494
with:
9595
name: docker-compose.yml.${{ env.REPO }}.testnet
9696
path: docker-compose.yml
9797

9898
- name: Upload docker-compose.yml artifact (repo2)
9999
if: env.REPO2 != 'None'
100-
uses: actions/upload-artifact@v3
100+
uses: actions/upload-artifact@v4
101101
with:
102102
name: docker-compose.yml.${{ env.REPO2 }}.testnet
103103
path: docker-compose.yml.${{ env.REPO2 }}
@@ -124,15 +124,15 @@ jobs:
124124
body: "TESTNET: This is helium-miner-software release TESTNET-${{ env.LATEST_GA }}-${{ env.day }}"
125125

126126
- name: Trigger build action in ${{ env.REPO }} repo
127-
uses: peter-evans/repository-dispatch@v2
127+
uses: peter-evans/repository-dispatch@v3
128128
with:
129129
token: ${{ secrets.MR_BUMP }}
130130
event-type: build-open-fleet
131131
repository: NebraLtd/${{ env.REPO }}
132132
client-payload: '{"release": "${{ env.LATEST_GA }}_GA", "tag": "${{ env.LATEST_GA }}", "firmware": "${{ env.FIRMWARE_SHORT_HASH }}", "branch": "${{ env.GITHUB_BRANCH }}"}'
133133

134134
- name: Trigger build action in ${{ env.REPO2 }} repo
135-
uses: peter-evans/repository-dispatch@v2
135+
uses: peter-evans/repository-dispatch@v3
136136
if: matrix.sbc == 'raspi' || matrix.sbc == 'rockpi'
137137
with:
138138
token: ${{ secrets.MR_BUMP }}

‎.github/workflows/push-to-testnet-nebraos-cloud.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rk3566, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566]
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Setup Python Libraries
2525
run: pip install -r requirements.txt
@@ -89,21 +89,21 @@ jobs:
8989
fi
9090
9191
- name: Balena Deploy
92-
uses: nebraltd/[email protected].0
92+
uses: nebraltd/[email protected].6
9393
with:
9494
balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
9595
balena_url: cloud.nebra.com
9696
balena_command: "deploy nebraltd/${{ env.FLEET }} --debug --nocache --build"
9797

9898
- name: Upload docker-compose.yml artifact
99-
uses: actions/upload-artifact@v3
99+
uses: actions/upload-artifact@v4
100100
with:
101101
name: docker-compose.yml.${{ env.REPO }}.testnet
102102
path: docker-compose.yml
103103

104104
- name: Upload docker-compose.yml artifact (repo2)
105105
if: env.REPO2 != 'None'
106-
uses: actions/upload-artifact@v3
106+
uses: actions/upload-artifact@v4
107107
with:
108108
name: docker-compose.yml.${{ env.REPO2 }}.testnet
109109
path: docker-compose.yml.${{ env.REPO2 }}
@@ -130,15 +130,15 @@ jobs:
130130
body: "TESTNET: This is helium-miner-software release TESTNET-${{ env.LATEST_GA }}-${{ env.day }}"
131131

132132
- name: Trigger build action in ${{ env.REPO }} repo
133-
uses: peter-evans/repository-dispatch@v2
133+
uses: peter-evans/repository-dispatch@v3
134134
with:
135135
token: ${{ secrets.MR_BUMP }}
136136
event-type: build-open-fleet
137137
repository: NebraLtd/${{ env.REPO }}
138138
client-payload: '{"release": "${{ env.LATEST_GA }}_GA", "tag": "${{ env.LATEST_GA }}", "firmware": "${{ env.FIRMWARE_SHORT_HASH }}", "branch": "${{ env.GITHUB_BRANCH }}"}'
139139

140140
- name: Trigger build action in ${{ env.REPO2 }} repo
141-
uses: peter-evans/repository-dispatch@v2
141+
uses: peter-evans/repository-dispatch@v3
142142
if: matrix.sbc == 'raspi' || matrix.sbc == 'rockpi'
143143
with:
144144
token: ${{ secrets.MR_BUMP }}

‎.github/workflows/python-tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on: [push, pull_request]
44
jobs:
55
build:
66

7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-22.04
88

99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111
- name: Set up Python 3.9
12-
uses: actions/setup-python@v4
12+
uses: actions/setup-python@v5
1313
with:
1414
python-version: 3.9
1515
- name: Run PyTest

‎.github/workflows/security-audit.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ on: [push, pull_request]
55
jobs:
66
build:
77

8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-22.04
99

1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- name: Set up Python 3.9
13-
uses: actions/setup-python@v4
13+
uses: actions/setup-python@v5
1414
with:
1515
python-version: 3.9
1616
- name: Run bandit against code base

‎.github/workflows/update-gatewayrs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
gatewayrs-update:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@v4
1010
with:
1111
ref: ${{ github.ref }}
1212
- run: |
@@ -20,7 +20,7 @@ jobs:
2020
sed -i -E "s/FIRMWARE_VERSION=.*/FIRMWARE_VERSION=$LATEST_GA/g" settings.ini
2121
sed -i -E "s/GATEWAYRS_VERSION=.*/GATEWAYRS_VERSION=$SHORT_SHA/g" settings.ini
2222
- name: Create Pull Request
23-
uses: peter-evans/create-pull-request@v5
23+
uses: peter-evans/create-pull-request@v6
2424
with:
2525
commit-message: Update gateway-rs to latest GA ${{ env.LATEST_GA }}
2626
branch: gatewayrs-bump/${{ env.LATEST_GA }}

‎.github/workflows/update-production.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
if: github.event.pull_request.merged == true
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
with:
1515
ref: ${{ github.ref }}
1616
fetch-depth: 0

‎requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
jinja2==3.1.2
1+
jinja2==3.1.4
22
grpcio==1.56.0
33
hm-pyhelper==0.14.32

‎settings.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
2-
FIRMWARE_VERSION=v1.3.0
3-
DIAGNOSTICS_VERSION=6d56740
2+
FIRMWARE_VERSION=v1.3.1
3+
DIAGNOSTICS_VERSION=96a66c1
44
CONFIG_VERSION=a198b83
55
PKTFWD_VERSION=5c3c90a
66
GATEWAYRS_VERSION=5428419

0 commit comments

Comments
 (0)