Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge wingbits to production #899

Merged
merged 9 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-open-fleets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commercial-file-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commercial-settings-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/openfleet-file-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/push-to-prod-nebraos-cloud-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: production

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/push-to-prod-nebraos-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: production

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/push-to-testnet-nebraos-cloud-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/push-to-testnet-nebraos-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/security-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-gatewayrs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
jinja2==3.1.2
jinja2==3.1.4
grpcio==1.56.0
hm-pyhelper==0.14.32
4 changes: 2 additions & 2 deletions settings.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down