fix #610: bump nanopb to 0.4.8

geeksville · geeksville · commit 8b781d32453e · 2024-06-25T10:25:58.000-07:00
Including in the Poetry changes because it touches the same lines
and I want to avoid hand merging ;-)
diff --git a/.github/workflows/update_protobufs.yml b/.github/workflows/update_protobufs.yml
@@ -18,9 +18,9 @@ jobs:
 
       - name: Download nanopb
         run: |
-          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.6-linux-x86.tar.gz
-          tar xvzf nanopb-0.4.6-linux-x86.tar.gz
-          mv nanopb-0.4.6-linux-x86 nanopb-0.4.6
+          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8-linux-x86.tar.gz
+          tar xvzf nanopb-0.4.8-linux-x86.tar.gz
+          mv nanopb-0.4.8-linux-x86 nanopb-0.4.8
 
       - name: Install poetry (needed by regen-protobufs.sh)
         run: |
diff --git a/bin/regen-protobufs.sh b/bin/regen-protobufs.sh
@@ -7,8 +7,8 @@
 # protoc looks for mypy plugin in the python path
 source $(poetry env info --path)/bin/activate
 
-./nanopb-0.4.6/generator-bin/protoc -I=protobufs --python_out ./ --mypy_out ./ ./protobufs/meshtastic/*.proto
-./nanopb-0.4.6/generator-bin/protoc -I=protobufs --python_out ./meshtastic/ --mypy_out ./meshtastic/ ./protobufs/nanopb.proto
+./nanopb-0.4.8/generator-bin/protoc -I=protobufs --python_out ./ --mypy_out ./ ./protobufs/meshtastic/*.proto
+./nanopb-0.4.8/generator-bin/protoc -I=protobufs --python_out ./meshtastic/ --mypy_out ./meshtastic/ ./protobufs/nanopb.proto
 
 # workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628
 
