pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-01 02:09:57 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Upgrade nanopb (#4973)

Browse Source
This commit is contained in:
Ben Meadors 2024-10-06 07:55:02 -05:00 committed by GitHub
parent 7febb41727
commit 001a845ac3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/update_protobufs.yml vendored
View File

@ -17,9 +17,9 @@ jobs:
- name: Download nanopb - name: Download nanopb
run: | run: |
wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8-linux-x86.tar.gz wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.9-linux-x86.tar.gz
tar xvzf nanopb-0.4.8-linux-x86.tar.gz tar xvzf nanopb-0.4.9-linux-x86.tar.gz
mv nanopb-0.4.8-linux-x86 nanopb-0.4.8 mv nanopb-0.4.9-linux-x86 nanopb-0.4.9
- name: Re-generate protocol buffers - name: Re-generate protocol buffers
run: | run: |

4
.trunk/trunk.yaml
View File

@ -11,7 +11,7 @@ lint:
- trufflehog@3.82.6 - trufflehog@3.82.6
- yamllint@1.35.1 - yamllint@1.35.1
- bandit@1.7.10 - bandit@1.7.10
- checkov@3.2.255 - checkov@3.2.256
- terrascan@1.19.1 - terrascan@1.19.1
- trivy@0.55.2 - trivy@0.55.2
#- trufflehog@3.63.2-rc0 #- trufflehog@3.63.2-rc0
@ -28,7 +28,7 @@ lint:
- shellcheck@0.10.0 - shellcheck@0.10.0
- black@24.8.0 - black@24.8.0
- git-diff-check - git-diff-check
- gitleaks@8.19.3 - gitleaks@8.20.0
- clang-format@16.0.3 - clang-format@16.0.3
- prettier@3.3.3 - prettier@3.3.3
ignore: ignore:

2
bin/regen-protos.bat
View File

@ -1 +1 @@
cd protobufs && ..\nanopb-0.4.8\generator-bin\protoc.exe --experimental_allow_proto3_optional "--nanopb_out=-S.cpp -v:..\src\mesh\generated" -I=..\protobufs\ ..\protobufs\meshtastic\*.proto cd protobufs && ..\nanopb-0.4.9\generator-bin\protoc.exe --experimental_allow_proto3_optional "--nanopb_out=-S.cpp -v:..\src\mesh\generated" -I=..\protobufs\ ..\protobufs\meshtastic\*.proto

6
bin/regen-protos.sh
View File

@ -2,10 +2,10 @@
set -e set -e
echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.8 to be located in the" echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.9 to be located in the"
echo "firmware root directory if the following step fails, you should download the correct" echo "firmware root directory if the following step fails, you should download the correct"
echo "prebuilt binaries for your computer into nanopb-0.4.8" echo "prebuilt binaries for your computer into nanopb-0.4.9"
# the nanopb tool seems to require that the .options file be in the current directory! # the nanopb tool seems to require that the .options file be in the current directory!
cd protobufs cd protobufs
../nanopb-0.4.8/generator-bin/protoc --experimental_allow_proto3_optional "--nanopb_out=-S.cpp -v:../src/mesh/generated/" -I=../protobufs meshtastic/*.proto ../nanopb-0.4.9/generator-bin/protoc --experimental_allow_proto3_optional "--nanopb_out=-S.cpp -v:../src/mesh/generated/" -I=../protobufs meshtastic/*.proto