Skip to content

Commit

Permalink
Merge pull request #4 from gogo/update-protos
Browse files Browse the repository at this point in the history
Sync with upstream, migrate to modules
  • Loading branch information
johanbrandhorst authored Apr 4, 2019
2 parents 8558fb4 + 4324f3c commit d31c731
Show file tree
Hide file tree
Showing 15 changed files with 933 additions and 605 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
before_install:
- ./install-protobuf.sh
- PATH=/home/travis/bin:$PATH protoc --version
- 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 regenerate
- PATH=/home/travis/bin:$PATH GO111MODULE=on make regenerate
- git diff --exit-code

language: go

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

53 changes: 0 additions & 53 deletions Gopkg.lock

This file was deleted.

12 changes: 0 additions & 12 deletions Gopkg.toml

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ regenerate:
google/api/annotations.proto

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

(cd ./google/rpc && rm status.proto; wget ${URL}/google/rpc/status.proto)
gogoreplace \
Expand Down
5 changes: 5 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module github.com/gogo/googleapis

go 1.12

require github.com/gogo/protobuf v1.2.1
6 changes: 6 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
16 changes: 8 additions & 8 deletions google/api/annotations.pb.go

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

Loading

0 comments on commit d31c731

Please sign in to comment.