Skip to content

Commit

Permalink
upgrade travis ci (#7)
Browse files Browse the repository at this point in the history
  • Loading branch information
ariesdevil authored Oct 11, 2019
1 parent b975aa7 commit e75841f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 18 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ os:
- osx

go:
- "1.10.x"
- "1.11.x"
- "1.12.x"
- "1.13.x"

env:
- GO111MODULE=on
Expand All @@ -15,10 +16,10 @@ before_install:
- pip install --user -r tests/pip-req.txt

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

script:
- diff <(goimports -d .) <(printf "")
- make install
- go get -u github.com/douban/gobeansdb
- make test
13 changes: 1 addition & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,6 @@ all:install

export PYTHONPATH=.

# FIXME: When this issue is done(https://github.com/golang/go/issues/23965#issuecomment-409232583)
# Determine the compiler and version
COMPILER_HELP := $(shell $(CC) --help | head -n 1)
ifneq (,$(findstring clang,$(COMPILER_HELP)))
COMPILER = clang
else ifneq (,$(findstring gcc,$(COMPILER_HELP)))
COMPILER = gcc
else
COMPILER = unknown
endif

test:
./misc/gobeansdb_server.sh start
go version
Expand All @@ -29,4 +18,4 @@ pytest:install

install:
GO111MODULE=on go mod vendor
CC=$(COMPILER) go install ./
go install ./
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ A proxy for [Gobeansdb](https://github.com/douban/gobeansdb).

## Prepare

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

## Install

Expand Down
2 changes: 1 addition & 1 deletion dstore/scheduler.go
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ func (sch *ManualScheduler) checkFailsForBucket(bucket *Bucket) {
} else {
logger.Infof(
"beansdb server %s in Bucket %X's Down while check fails , err is %s",
hostBucket.host.Addr, bucket, err)
hostBucket.host.Addr, bucket.ID, err)
}
}
}
Expand Down

0 comments on commit e75841f

Please sign in to comment.