Skip to content

Commit

Permalink
Merge pull request #419 from gcash/build-update
Browse files Browse the repository at this point in the history
[Chore] Update deps and build with Go 1.15.3
  • Loading branch information
cpacia committed Oct 24, 2020
2 parents 2db6028 + d387f82 commit 862bb60
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 52 deletions.
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ language: go
go_import_path: github.com/gcash/bchd
go:
- "1.12.17"
- "1.13.10"
- "1.14.7"
- "1.13.15"
- "1.14.10"
- "1.15.3"

sudo: false

Expand All @@ -27,7 +28,7 @@ script:
- ./goclean.sh

after_script:
- if [ "$TRAVIS_GO_VERSION" = "1.14.7" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/inconshreveable/mousetrap; fi
- if [ "$TRAVIS_GO_VERSION" = "1.14.7" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/mitchellh/gox; fi
- if [ "$TRAVIS_GO_VERSION" = "1.14.7" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/tcnksm/ghr; fi
- if [ "$TRAVIS_GO_VERSION" = "1.14.7" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then make compile; ghr --username gcash --token $GITHUB_TOKEN --replace $TRAVIS_TAG pkg/; fi
- if [ "$TRAVIS_GO_VERSION" = "1.15.3" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/inconshreveable/mousetrap; fi
- if [ "$TRAVIS_GO_VERSION" = "1.15.3" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/mitchellh/gox; fi
- if [ "$TRAVIS_GO_VERSION" = "1.15.3" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/tcnksm/ghr; fi
- if [ "$TRAVIS_GO_VERSION" = "1.15.3" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then make compile; ghr --username gcash --token $GITHUB_TOKEN --replace $TRAVIS_TAG pkg/; fi
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ CLINAME = bchctl
OUTDIR = pkg

# Allow user to override cross compilation scope
OSARCH ?= darwin/386 darwin/amd64 dragonfly/amd64 freebsd/386 freebsd/amd64 freebsd/arm linux/386 linux/amd64 linux/arm netbsd/386 netbsd/amd64 netbsd/arm openbsd/386 openbsd/amd64 plan9/386 plan9/amd64 solaris/amd64 windows/386 windows/amd64
DIRS ?= darwin_386 darwin_amd64 dragonfly_amd64 freebsd_386 freebsd_amd64 freebsd_arm linux_386 linux_amd64 linux_arm netbsd_386 netbsd_amd64 netbsd_arm openbsd_386 openbsd_amd64 plan9_386 plan9_amd64 solaris_amd64 windows_386 windows_amd64
OSARCH ?= darwin/amd64 dragonfly/amd64 freebsd/386 freebsd/amd64 freebsd/arm linux/386 linux/amd64 linux/arm netbsd/386 netbsd/amd64 netbsd/arm openbsd/386 openbsd/amd64 plan9/386 plan9/amd64 solaris/amd64 windows/386 windows/amd64
DIRS ?= darwin_amd64 dragonfly_amd64 freebsd_386 freebsd_amd64 freebsd_arm linux_386 linux_amd64 linux_arm netbsd_386 netbsd_amd64 netbsd_arm openbsd_386 openbsd_amd64 plan9_386 plan9_amd64 solaris_amd64 windows_386 windows_amd64

all:
go build .
Expand Down
50 changes: 26 additions & 24 deletions bchrpc/pb/bchrpc.pb.go

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

14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ require (
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792
github.com/btcsuite/winsvc v1.0.0
github.com/davecgh/go-spew v1.1.1
github.com/dchest/siphash v1.2.1
github.com/dchest/siphash v1.2.2
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/gcash/bchlog v0.0.0-20180913005452-b4f036f92fa6
github.com/gcash/bchutil v0.0.0-20200506001747-c2894cd54b33
github.com/golang/protobuf v1.4.2
github.com/golang/protobuf v1.4.3
github.com/gorilla/websocket v1.4.2 // indirect
github.com/improbable-eng/grpc-web v0.13.0
github.com/jessevdk/go-flags v0.0.0-20181221193153-c0795c8afcf4
github.com/jrick/logrotate v1.0.0
github.com/zquestz/grab v0.0.0-20190224022517-abcee96e61b1
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c // indirect
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201022231255-08b38378de70 // indirect
golang.org/x/sys v0.0.0-20201022201747-fb209a7c41cd // indirect
golang.org/x/text v0.3.3
google.golang.org/genproto v0.0.0-20200724131911-43cab4749ae7 // indirect
google.golang.org/grpc v1.30.0
google.golang.org/genproto v0.0.0-20201022181438-0ff5f38871d5 // indirect
google.golang.org/grpc v1.33.1
google.golang.org/protobuf v1.25.0
)
Loading

0 comments on commit 862bb60

Please sign in to comment.