fix: fix make regenerate (#14)

cosmos · Oct 25, 2022 · b5eb9e6 · b5eb9e6
1 parent a149934
commit b5eb9e6
Show file tree

Hide file tree

Showing 371 changed files with 20,355 additions and 19,733 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -18,9 +18,9 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup go
-      - uses: actions/setup-go@v3
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Setup protoc
         env:
@@ -29,8 +29,6 @@ jobs:
 
       - name: Protoc version
         run: PATH=$HOME/bin:$PATH protoc --version
-      - name: env
-        run: env && go env && pwd
 
       - name: Build server all
-        run: make buildserverall
+        run: PATH=$HOME/bin:$PATH make buildserverall
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Bug Fixes
+
+- [#14](https://github.com/cosmos/gogoproto/pull/14) Fix `make regenerate`.
+
 ## [v1.4.2](https://github.com/cosmos/gogoproto/releases/tag/v1.4.2) - 2022-09-14
 
 ### Features

diff --git a/GOLANG_CONTRIBUTORS b/GOLANG_CONTRIBUTORS
diff --git a/Makefile b/Makefile
@@ -53,6 +53,7 @@ install:
 	go install ./protoc-gen-gogofaster
 	go install ./protoc-gen-gogoslick
 	go install ./protoc-gen-gostring
+	go install ./protoc-gen-gogotypes
 	go install ./protoc-min-version
 	go install ./protoc-gen-combo
 	go install ./protoc-gen-gocosmos

diff --git a/bench.md b/bench.md
diff --git a/conformance/internal/conformance_proto/conformance.pb.go b/conformance/internal/conformance_proto/conformance.pb.go
diff --git a/go.mod b/go.mod
@@ -1,11 +1,13 @@
 module github.com/cosmos/gogoproto
 
-go 1.18
+go 1.19
 
-require google.golang.org/grpc v1.50.1
+require (
+	github.com/golang/protobuf v1.5.2
+	google.golang.org/grpc v1.50.1
+)
 
 require (
-	github.com/golang/protobuf v1.5.2 // indirect
 	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
 	golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86 // indirect
 	golang.org/x/text v0.3.7 // indirect

diff --git a/go.sum b/go.sum
@@ -132,4 +132,4 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=