Skip to content

Commit

Permalink
Merge branch 'main' into dwedul/2135-openapiv2
Browse files Browse the repository at this point in the history
  • Loading branch information
SpicyLemon authored Oct 7, 2024
2 parents 83dcfde + c4ce165 commit 32c0cf7
Show file tree
Hide file tree
Showing 5 changed files with 5,806 additions and 4,911 deletions.
1 change: 1 addition & 0 deletions .changelog/unreleased/bug-fixes/376-fix-markdown-gen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Fix proto markdown generation and regenerate proto-docs.md [#376](https://github.com/provenance-io/provenance/issues/376).
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,9 @@ indexer-db-down:
##############################
# Proto -> golang compilation
##############################
proto-all: proto-update-deps proto-format proto-lint proto-check-breaking proto-check-breaking-third-party proto-gen proto-swagger-gen
proto-all: proto-update-deps proto-format proto-lint proto-check-breaking proto-check-breaking-third-party proto-gen proto-swagger-gen proto-doc-gen
proto-checks: proto-update-deps proto-lint proto-check-breaking proto-check-breaking-third-party
proto-regen: proto-format proto-gen proto-swagger-gen
proto-regen: proto-format proto-gen proto-swagger-gen proto-doc-gen

protoVer=0.15.1
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
Expand All @@ -495,6 +495,10 @@ proto-swagger-gen:
@echo "Generating Protobuf Swagger"
$(protoImage) sh ./scripts/protoc-swagger-gen.sh

proto-doc-gen:
@echo "Generating Protobuf Markdown"
./scripts/proto-doc-gen.sh

proto-format:
@echo "Formatting Protobuf files"
$(protoImage) find . \
Expand Down Expand Up @@ -524,7 +528,7 @@ proto-update-deps:
@echo "Updating Protobuf files"
sh ./scripts/proto-update-deps.sh

.PHONY: proto-all proto-checks proto-regen proto-gen proto-format proto-lint proto-check-breaking proto-check-breaking-third-party proto-update-deps proto-update-check
.PHONY: proto-all proto-checks proto-regen proto-gen proto-format proto-lint proto-check-breaking proto-check-breaking-third-party proto-update-deps proto-update-check proto-doc-gen


##############################
Expand Down
Loading

0 comments on commit 32c0cf7

Please sign in to comment.