From 622e37ae53dec7687e3958aa30f056a5ccf8bf43 Mon Sep 17 00:00:00 2001 From: Daniel Pupius Date: Fri, 2 May 2025 13:04:56 -0700 Subject: [PATCH] Another try at fixing proto in CI --- .github/workflows/cicd.yml | 6 ++++-- Makefile | 2 +- web/src/components/PacketList.test.tsx | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 881758e..701b08d 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -28,8 +28,10 @@ jobs: sudo apt-get update sudo apt-get install -y protobuf-compiler - - name: Install Go protobuf tools - run: make tools + - name: Install protoc-gen-go + run: | + go install google.golang.org/protobuf/cmd/protoc-gen-go@latest + echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - name: Generate Protocol Buffers run: make gen-proto diff --git a/Makefile b/Makefile index 14e0ee4..191004c 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ baymesh: build @./dist/meshstream --verbose --mqtt-topic-prefix "msh/US/bayarea" 2>&1 | go tool github.com/dpup/logista # Generate Go code from Protocol Buffers -gen-proto: tools +gen-proto: @mkdir -p $(ROOT_DIR)/generated PATH="$(TOOLS_DIR):$$PATH" protoc \ -Iproto/ \ diff --git a/web/src/components/PacketList.test.tsx b/web/src/components/PacketList.test.tsx index 883e907..ad40abc 100644 --- a/web/src/components/PacketList.test.tsx +++ b/web/src/components/PacketList.test.tsx @@ -19,6 +19,6 @@ describe('PacketList', () => { ); - expect(screen.getByText('No packets received yet')).toBeInTheDocument(); + expect(screen.getByText('Waiting for packets')).toBeInTheDocument(); }); });