Skip to content

Commit

Permalink
update to latest gogo/protobuf, only test with modules enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
zaquestion committed Jun 8, 2019
1 parent ee5466f commit 9d10b8c
Show file tree
Hide file tree
Showing 6 changed files with 170 additions and 84 deletions.
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,20 @@ sudo: false

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

matrix:
include:
- go: 1.11.x
env: GO111MODULE=on
env:
- GO111MODULE=on

go_import_path: github.com/metaverse/truss

before_install:
# protobuf
# download, unzip in $HOME, add to $PATH
- wget https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip
- mv protoc-3.5.1-linux-x86_64.zip $HOME
- unzip ~/protoc-3.5.1-linux-x86_64.zip -d $HOME
- wget https://github.com/google/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip
- mv protoc-3.6.1-linux-x86_64.zip $HOME
- unzip ~/protoc-3.6.1-linux-x86_64.zip -d $HOME
- export PATH=$HOME/bin/:$PATH

install:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ VERSION_DATE := $(shell $(MAKEFILE_PATH)/commit_date.sh)
default: truss

dependencies:
go get -u github.com/gogo/protobuf/protoc-gen-gogo
go get -u github.com/gogo/protobuf/protoc-gen-gogofaster
go get -u github.com/gogo/protobuf/proto
go get -u github.com/gogo/protobuf/protoc-gen-gogo@21df5aa0e680850681b8643f0024f92d3b09930c
go get -u github.com/gogo/protobuf/protoc-gen-gogofaster@21df5aa0e680850681b8643f0024f92d3b09930c
go get -u github.com/gogo/protobuf/proto@21df5aa0e680850681b8643f0024f92d3b09930c
go get -u github.com/kevinburke/go-bindata/...

# Generate go files containing the all template files in []byte form
Expand Down
Loading

0 comments on commit 9d10b8c

Please sign in to comment.