diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml index b27f60b9e8..d6cc07d1eb 100644 --- a/.github/workflows/proto.yml +++ b/.github/workflows/proto.yml @@ -40,10 +40,10 @@ jobs: with: PATTERNS: | **/**.proto - - name: proto-gen + - name: proto-gen-ci if: env.GIT_DIFF run: | - make proto-gen # proto-swagger-gen FIXME swagger-gen result is not reproducible in CI + make proto-genci # proto-swagger-gen FIXME swagger-gen result is not reproducible in CI git checkout -- go.mod go.sum docs/api/proto-docs.md # FIXME doc gen not reproducible in CI - name: check working directory is clean uses: numtide/clean-git-action@main diff --git a/Makefile b/Makefile index 61384ded26..dfa601477a 100644 --- a/Makefile +++ b/Makefile @@ -272,7 +272,8 @@ endif HTTPS_GIT := https://github.com/crypto-org-chain/cronos.git protoVer=0.14.0 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer) -protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace --user root $(protoImageName) +protoImageCi=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace --user root $(protoImageName) +protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) # ------ # NOTE: If you are experiencing problems running these commands, try deleting @@ -280,6 +281,10 @@ protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace --use # proto-all: proto-format proto-lint proto-gen +proto-gen-ci: + @echo "Generating Protobuf files" + $(protoImageCi) sh ./scripts/protocgen.sh + proto-gen: @echo "Generating Protobuf files" $(protoImage) sh ./scripts/protocgen.sh