build: update to use go1.12 for the build

This commit is contained in:
Nick Craig-Wood 2019-02-26 13:18:31 +00:00
parent 0a56a168ff
commit 63bb6de491
2 changed files with 5 additions and 5 deletions

View File

@ -8,7 +8,7 @@ go:
- 1.9.x - 1.9.x
- 1.10.x - 1.10.x
- 1.11.x - 1.11.x
- 1.12rc1 - 1.12.x
- tip - tip
go_import_path: github.com/ncw/rclone go_import_path: github.com/ncw/rclone
before_install: before_install:
@ -44,7 +44,7 @@ matrix:
- go: tip - go: tip
include: include:
- os: osx - os: osx
go: 1.12rc1 go: 1.12.x
env: GOTAGS="" env: GOTAGS=""
cache: cache:
directories: directories:
@ -56,5 +56,5 @@ deploy:
on: on:
repo: ncw/rclone repo: ncw/rclone
all_branches: true all_branches: true
go: 1.12rc1 go: 1.12.x
condition: $TRAVIS_PULL_REQUEST == false condition: $TRAVIS_PULL_REQUEST == false

View File

@ -17,8 +17,8 @@ ifneq ($(TAG),$(LAST_TAG))
endif endif
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/ )
# Run full tests if go >= go1.11 # Run full tests if go >= go1.12
FULL_TESTS := $(shell go version | perl -lne 'print "go$$1.$$2" if /go(\d+)\.(\d+)/ && ($$1 > 1 || $$2 >= 11)') FULL_TESTS := $(shell go version | perl -lne 'print "go$$1.$$2" if /go(\d+)\.(\d+)/ && ($$1 > 1 || $$2 >= 12)')
BETA_PATH := $(BRANCH_PATH)$(TAG) BETA_PATH := $(BRANCH_PATH)$(TAG)
BETA_URL := https://beta.rclone.org/$(BETA_PATH)/ BETA_URL := https://beta.rclone.org/$(BETA_PATH)/
BETA_UPLOAD_ROOT := memstore:beta-rclone-org BETA_UPLOAD_ROOT := memstore:beta-rclone-org