Skip to content

Commit 862bb60

Browse files
authored
Merge pull request #419 from gcash/build-update
[Chore] Update deps and build with Go 1.15.3
2 parents 2db6028 + d387f82 commit 862bb60

File tree

5 files changed

+58
-52
lines changed

5 files changed

+58
-52
lines changed

.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ language: go
22
go_import_path: github.com/gcash/bchd
33
go:
44
- "1.12.17"
5-
- "1.13.10"
6-
- "1.14.7"
5+
- "1.13.15"
6+
- "1.14.10"
7+
- "1.15.3"
78

89
sudo: false
910

@@ -27,7 +28,7 @@ script:
2728
- ./goclean.sh
2829

2930
after_script:
30-
- if [ "$TRAVIS_GO_VERSION" = "1.14.7" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/inconshreveable/mousetrap; fi
31-
- if [ "$TRAVIS_GO_VERSION" = "1.14.7" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/mitchellh/gox; fi
32-
- if [ "$TRAVIS_GO_VERSION" = "1.14.7" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/tcnksm/ghr; fi
33-
- 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
31+
- if [ "$TRAVIS_GO_VERSION" = "1.15.3" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/inconshreveable/mousetrap; fi
32+
- if [ "$TRAVIS_GO_VERSION" = "1.15.3" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/mitchellh/gox; fi
33+
- if [ "$TRAVIS_GO_VERSION" = "1.15.3" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then go get github.com/tcnksm/ghr; fi
34+
- 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

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ CLINAME = bchctl
33
OUTDIR = pkg
44

55
# Allow user to override cross compilation scope
6-
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
7-
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
6+
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
7+
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
88

99
all:
1010
go build .

bchrpc/pb/bchrpc.pb.go

Lines changed: 26 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ require (
88
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792
99
github.com/btcsuite/winsvc v1.0.0
1010
github.com/davecgh/go-spew v1.1.1
11-
github.com/dchest/siphash v1.2.1
11+
github.com/dchest/siphash v1.2.2
1212
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
1313
github.com/gcash/bchlog v0.0.0-20180913005452-b4f036f92fa6
1414
github.com/gcash/bchutil v0.0.0-20200506001747-c2894cd54b33
15-
github.com/golang/protobuf v1.4.2
15+
github.com/golang/protobuf v1.4.3
1616
github.com/gorilla/websocket v1.4.2 // indirect
1717
github.com/improbable-eng/grpc-web v0.13.0
1818
github.com/jessevdk/go-flags v0.0.0-20181221193153-c0795c8afcf4
1919
github.com/jrick/logrotate v1.0.0
2020
github.com/zquestz/grab v0.0.0-20190224022517-abcee96e61b1
21-
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
22-
golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
23-
golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c // indirect
21+
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
22+
golang.org/x/net v0.0.0-20201022231255-08b38378de70 // indirect
23+
golang.org/x/sys v0.0.0-20201022201747-fb209a7c41cd // indirect
2424
golang.org/x/text v0.3.3
25-
google.golang.org/genproto v0.0.0-20200724131911-43cab4749ae7 // indirect
26-
google.golang.org/grpc v1.30.0
25+
google.golang.org/genproto v0.0.0-20201022181438-0ff5f38871d5 // indirect
26+
google.golang.org/grpc v1.33.1
2727
google.golang.org/protobuf v1.25.0
2828
)

0 commit comments

Comments
 (0)