Skip to content

Commit e75841f

Browse files
authored
upgrade travis ci (#7)
1 parent b975aa7 commit e75841f

File tree

4 files changed

+7
-18
lines changed

4 files changed

+7
-18
lines changed

.travis.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ os:
55
- osx
66

77
go:
8-
- "1.10.x"
98
- "1.11.x"
9+
- "1.12.x"
10+
- "1.13.x"
1011

1112
env:
1213
- GO111MODULE=on
@@ -15,10 +16,10 @@ before_install:
1516
- pip install --user -r tests/pip-req.txt
1617

1718
install:
18-
- go get -t -v ./...
1919
- go get -u golang.org/x/tools/cmd/goimports
20-
- go get -u github.com/douban/gobeansdb
2120

2221
script:
2322
- diff <(goimports -d .) <(printf "")
23+
- make install
24+
- go get -u github.com/douban/gobeansdb
2425
- make test

Makefile

+1-12
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@ all:install
22

33
export PYTHONPATH=.
44

5-
# FIXME: When this issue is done(https://github.com/golang/go/issues/23965#issuecomment-409232583)
6-
# Determine the compiler and version
7-
COMPILER_HELP := $(shell $(CC) --help | head -n 1)
8-
ifneq (,$(findstring clang,$(COMPILER_HELP)))
9-
COMPILER = clang
10-
else ifneq (,$(findstring gcc,$(COMPILER_HELP)))
11-
COMPILER = gcc
12-
else
13-
COMPILER = unknown
14-
endif
15-
165
test:
176
./misc/gobeansdb_server.sh start
187
go version
@@ -29,4 +18,4 @@ pytest:install
2918

3019
install:
3120
GO111MODULE=on go mod vendor
32-
CC=$(COMPILER) go install ./
21+
go install ./

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ A proxy for [Gobeansdb](https://github.com/douban/gobeansdb).
44

55
## Prepare
66

7-
GoBeansProxy use `vgo` manage dependencies, please install [vgo](https://godoc.org/golang.org/x/vgo) first.
8-
Supported Go version: 1.10.1+
7+
Supported Go version: > 1.11.0
98

109
## Install
1110

dstore/scheduler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ func (sch *ManualScheduler) checkFailsForBucket(bucket *Bucket) {
255255
} else {
256256
logger.Infof(
257257
"beansdb server %s in Bucket %X's Down while check fails , err is %s",
258-
hostBucket.host.Addr, bucket, err)
258+
hostBucket.host.Addr, bucket.ID, err)
259259
}
260260
}
261261
}

0 commit comments

Comments
 (0)