Skip to content

Commit

Permalink
Merge pull request #3 from gogo/regenerate-gogoproto-v1.1.1
Browse files Browse the repository at this point in the history
Regenerate with GoGo Protobuf v1.1.1
  • Loading branch information
johanbrandhorst authored Aug 13, 2018
2 parents b235787 + e9a3945 commit 8558fb4
Show file tree
Hide file tree
Showing 14 changed files with 1,111 additions and 182 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vendor
14 changes: 8 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
before_install:
- ./install-protobuf.sh
- PATH=/home/travis/bin:$PATH protoc --version
- go get github.com/gogo/protobuf/protoc-gen-gogo/descriptor
- go get github.com/gogo/protobuf/types
- go get github.com/gogo/protobuf/protoc-gen-gogotypes
- go get github.com/gogo/protobuf/gogoreplace
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
- dep ensure --vendor-only
- echo $TRAVIS_GO_VERSION

script:
- PATH=/home/travis/bin:$PATH make test
- PATH=/home/travis/bin:$PATH make regenerate
- git diff --exit-code

language: go

go:
- 1.9.x
- "1.9.x"
- "1.10.x"
- tip

53 changes: 53 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
required = [
"github.com/gogo/protobuf/gogoreplace",
]

[[constraint]]
name = "github.com/gogo/protobuf"
version = "1.1.1"

[prune]
go-tests = true
unused-packages = true
non-go = true
9 changes: 3 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
URL="https://raw.githubusercontent.com/googleapis/googleapis/master/"

test:
go test ./...

regenerate:
go install github.com/gogo/googleapis/protoc-gen-gogogoogleapis
go install ./protoc-gen-gogogoogleapis

protoc \
--gogogoogleapis_out=\
Expand All @@ -25,7 +22,7 @@ regenerate:
google/api/annotations.proto

update:
go install github.com/gogo/protobuf/gogoreplace
go install ./vendor/github.com/gogo/protobuf/gogoreplace

(cd ./google/rpc && rm status.proto; wget ${URL}/google/rpc/status.proto)
gogoreplace \
Expand Down Expand Up @@ -55,4 +52,4 @@ update:
gogoreplace \
'option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";' \
'option go_package = "api";' \
./google/api/annotations.proto
./google/api/annotations.proto
16 changes: 12 additions & 4 deletions google/api/annotations.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions google/api/api_test.go

This file was deleted.

Loading

0 comments on commit 8558fb4

Please sign in to comment.