From 64ecc2f58731f0eb006f7cec8bca8a7ae387d6cb Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Fri, 17 Aug 2018 21:02:50 +0100 Subject: [PATCH] build: use go1.11rc1 to make the beta releases --- .travis.yml | 5 +++-- Makefile | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09186e120..5f83c27a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ go: - 1.8.7 - 1.9.3 - "1.10.1" +- "1.11rc1" - tip before_install: - if [[ $TRAVIS_OS_NAME == linux ]]; then sudo modprobe fuse ; sudo chmod 666 /dev/fuse ; sudo chown root:$USER /etc/fuse.conf ; fi @@ -38,7 +39,7 @@ matrix: - go: tip include: - os: osx - go: "1.10.1" + go: "1.11rc1" env: GOTAGS="" deploy: provider: script @@ -46,5 +47,5 @@ deploy: skip_cleanup: true on: all_branches: true - go: "1.10.1" + go: "1.11rc1" condition: $TRAVIS_PULL_REQUEST == false diff --git a/Makefile b/Makefile index 3dd4e66a0..20267de4f 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ LAST_TAG := $(shell git describe --tags --abbrev=0) NEW_TAG := $(shell echo $(LAST_TAG) | perl -lpe 's/v//; $$_ += 0.01; $$_ = sprintf("v%.2f", $$_)') GO_VERSION := $(shell go version) GO_FILES := $(shell go list ./... | grep -v /vendor/ ) -# Run full tests if go >= go1.9 -FULL_TESTS := $(shell go version | perl -lne 'print "go$$1.$$2" if /go(\d+)\.(\d+)/ && ($$1 > 1 || $$2 >= 9)') +# Run full tests if go >= go1.11 +FULL_TESTS := $(shell go version | perl -lne 'print "go$$1.$$2" if /go(\d+)\.(\d+)/ && ($$1 > 1 || $$2 >= 11)') BETA_PATH := $(BRANCH_PATH)$(TAG) BETA_URL := https://beta.rclone.org/$(BETA_PATH)/ BETA_UPLOAD_ROOT := memstore:beta-rclone-org