alexvanin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

Update to using go1.9 as the default go version

Browse source 
Get rid of Makefile spaghetti for avoiding vendor directory where
possible in make check.
This commit is contained in:
Nick Craig-Wood 2017-08-29 14:22:07 +01:00
parent 459cf64403
commit 672c410235
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

@ -5,8 +5,9 @@ os:
- linux - linux
go: go:
- 1.6.4 - 1.6.4
- 1.7.4 - 1.7.6
- 1.8.3 - 1.8.3
- 1.9
- tip - tip
install: install:
- git fetch --unshallow --tags - git fetch --unshallow --tags
@ -31,12 +32,12 @@ matrix:
- go: tip - go: tip
include: include:
- os: osx - os: osx
go: 1.8.3 go: 1.9
env: GOTAGS="" env: GOTAGS=""
deploy: deploy:
provider: script provider: script
script: make travis_beta script: make travis_beta
on: on:
branch: master branch: master
go: 1.8.3 go: 1.9
condition: "`uname` == 'Linux'" condition: "`uname` == 'Linux'"

4
Makefile
View file

@ -4,7 +4,7 @@ LAST_TAG := $(shell git describe --tags --abbrev=0)
NEW_TAG := $(shell echo $(LAST_TAG) | perl -lpe 's/v//; $$_ += 0.01; $$_ = sprintf("v%.2f", $$_)') NEW_TAG := $(shell echo $(LAST_TAG) | perl -lpe 's/v//; $$_ += 0.01; $$_ = sprintf("v%.2f", $$_)')
GO_VERSION := $(shell go version) GO_VERSION := $(shell go version)
GO_FILES := $(shell go list ./... | grep -v /vendor/ ) GO_FILES := $(shell go list ./... | grep -v /vendor/ )
GO_LATEST := $(findstring go1.8,$(GO_VERSION)) GO_LATEST := $(findstring go1.9,$(GO_VERSION))
BETA_URL := https://beta.rclone.org/$(TAG)/ BETA_URL := https://beta.rclone.org/$(TAG)/
# Pass in GOTAGS=xyz on the make command line to set build tags # Pass in GOTAGS=xyz on the make command line to set build tags
ifdef GOTAGS ifdef GOTAGS
@ -45,7 +45,7 @@ endif
# Do source code quality checks # Do source code quality checks
check: rclone check: rclone
ifdef GO_LATEST ifdef GO_LATEST
go tool vet $(BUILDTAGS) -printfuncs Debugf,Infof,Logf,Errorf . 2>&1 | grep -E -v vendor/ ; test $$? -eq 1 go vet $(BUILDTAGS) -printfuncs Debugf,Infof,Logf,Errorf ./...
errcheck $(BUILDTAGS) $(GO_FILES) errcheck $(BUILDTAGS) $(GO_FILES)
find . -name \*.go | grep -v /vendor/ | xargs goimports -d | grep . ; test $$? -eq 1 find . -name \*.go | grep -v /vendor/ | xargs goimports -d | grep . ; test $$? -eq 1
go list ./... | grep -v /vendor/ | xargs -i golint {} | grep -E -v '(StorageUrl|CdnUrl)' ; test $$? -eq 1 go list ./... | grep -v /vendor/ | xargs -i golint {} | grep -E -v '(StorageUrl|CdnUrl)' ; test $$? -eq 1