fix proto gh action

axelarnetwork · Jan 21, 2025 · 3b5e209 · 3b5e209
1 parent 8041198
commit 3b5e209
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/check-proto-generate.yaml b/.github/workflows/check-proto-generate.yaml
@@ -20,7 +20,7 @@ jobs:
           go install github.com/rakyll/statik
 
       - name: Generate proto files and docs
-        run: make proto-format proto-gen
+        run: make proto-format proto-gen proto-swagger-gen
 
       - name: Check for changes
         run: |

diff --git a/Makefile b/Makefile
@@ -200,9 +200,9 @@ tofnd-client:
 
 proto-all: proto-format proto-lint proto-gen
 
-protoVer=0.13.0
+protoVer=0.14.0
 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
-protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
+protoImage=$(DOCKER) run -u 0 --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
 
 proto-gen:
 	@echo "Generating Protobuf files"
@@ -211,8 +211,7 @@ proto-gen:
 proto-swagger-gen:
 	@make clean
 	@echo "Downloading Protobuf dependencies"
-	@make proto-swagger-download-dep
-
+	@make proto-swagger-download-deps
 	@echo "Generating Protobuf Swagger endpoint"
 	@$(protoImage) sh ./scripts/protoc-swagger-gen.sh
 

diff --git a/scripts/protoc-swagger-gen.sh b/scripts/protoc-swagger-gen.sh
@@ -34,7 +34,7 @@ done
 
 cd ..
 
-swagger-combine ./client/docs/config.json -o o ./client/docs/static/swagger/swagger.yaml -f yaml --continueOnConflictingPaths true --includeDefinitions true
+swagger-combine ./client/docs/config.json -o ./client/docs/static/swagger/swagger.yaml -f yaml --continueOnConflictingPaths true --includeDefinitions true
 
 # clean swagger files
 rm -rf "$SWAGGER_DIR"