uwaru/matterbridge
1
0
Fork 0
forked from jshiffer/matterbridge
Code Pull Requests Activity

Bump Go version in Travis CI (#518)

Browse Source
This commit is contained in:
Duco van Amstel 2018-10-12 22:14:36 +01:00 committed by Wim
parent 917040b044
commit 97b1fc813b
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -1,8 +1,6 @@
language: go language: go
go: go:
#- 1.7.x - 1.11.x
- 1.10.x
# - tip
# we have everything vendored # we have everything vendored
install: true install: true

2
ci/bintray.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
go version |grep go1.10 || exit go version | grep go1.11 || exit
VERSION=$(git describe --tags) VERSION=$(git describe --tags)
mkdir ci/binaries mkdir ci/binaries
GOOS=windows GOARCH=amd64 go build -ldflags "-s -w -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o ci/binaries/matterbridge-$VERSION-windows-amd64.exe GOOS=windows GOARCH=amd64 go build -ldflags "-s -w -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o ci/binaries/matterbridge-$VERSION-windows-amd64.exe

2
matterclient/matterclient.go
View File

@ -843,7 +843,7 @@ func (m *MMClient) StatusLoop() {
if m.OnWsConnect != nil { if m.OnWsConnect != nil {
m.OnWsConnect() m.OnWsConnect()
} }
m.log.Debug("StatusLoop:", m.OnWsConnect) m.log.Debugf("StatusLoop: %p", m.OnWsConnect)
for { for {
if m.WsQuit { if m.WsQuit {
return return