From 22a25ef15c7f5d0030d2bb49d458e7546d15d7fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 9 May 2018 20:52:01 +0200 Subject: [PATCH] switch minimum go version to go 1.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit License: MIT Signed-off-by: Łukasz Magiera Signed-off-by: Victor Bjelkholm Signed-off-by: Steven Allen --- .travis.yml | 2 +- Dockerfile | 2 +- Dockerfile.fast | 2 +- README.md | 4 ++-- bin/Rules.mk | 6 +++--- ci/Jenkinsfile | 3 ++- circle.yml | 6 +++--- mk/golang.mk | 2 +- package.json | 2 +- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9b9ab576..a040ea819 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ os: language: go go: - - 1.9 + - 1.10.2 env: - TEST_NO_FUSE=1 TEST_VERBOSE=1 TEST_SUITE=test_go_expensive diff --git a/Dockerfile b/Dockerfile index 8b122cdcf..3246f2c0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.9-stretch +FROM golang:1.10-stretch MAINTAINER Lars Gierth # There is a copy of this Dockerfile called Dockerfile.fast, diff --git a/Dockerfile.fast b/Dockerfile.fast index 9b7142236..e4266cb21 100644 --- a/Dockerfile.fast +++ b/Dockerfile.fast @@ -1,4 +1,4 @@ -FROM golang:1.9-stretch +FROM golang:1.10-stretch MAINTAINER Lars Gierth # This is a copy of /Dockerfile, diff --git a/README.md b/README.md index 6a192f35e..3e7689c7d 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ With snap, in any of the [supported Linux distributions](https://snapcraft.io/do #### Install Go -The build process for ipfs requires Go 1.9 or higher. If you don't have it: [Download Go 1.9+](https://golang.org/dl/). +The build process for ipfs requires Go 1.10 or higher. If you don't have it: [Download Go 1.10+](https://golang.org/dl/). You'll need to add Go's bin directories to your `$PATH` environment variable e.g., by adding these lines to your `/etc/profile` (for a system-wide installation) or `$HOME/.profile`: @@ -147,7 +147,7 @@ mismatched APIs. * Also, [instructions for OpenBSD](docs/openbsd.md). * `git` is required in order for `go get` to fetch all dependencies. * Package managers often contain out-of-date `golang` packages. - Ensure that `go version` reports at least 1.9. See above for how to install go. + Ensure that `go version` reports at least 1.10. See above for how to install go. * If you are interested in development, please install the development dependencies as well. * *WARNING: Older versions of OSX FUSE (for Mac OS X) can cause kernel panics when mounting!* diff --git a/bin/Rules.mk b/bin/Rules.mk index c1ad365f7..5ca6b8fba 100644 --- a/bin/Rules.mk +++ b/bin/Rules.mk @@ -1,9 +1,9 @@ include mk/header.mk -dist_root_$(d)=/ipfs/QmT3CLJKJzWPuN4NAN4LLy69UpKskMF3AuYhXstKdn8V43 +dist_root_$(d)="/ipfs/QmXtsjCX29kcdeSjrijWiFTK1qwQNW8UrEWDi8okuC2Pog" -$(d)/gx: $(d)/gx-v0.12.1 -$(d)/gx-go: $(d)/gx-go-v1.6.0 +$(d)/gx: $(d)/gx-v0.13.0 +$(d)/gx-go: $(d)/gx-go-v1.7.0 TGTS_$(d) := $(d)/gx $(d)/gx-go DISTCLEAN += $(wildcard $(d)/gx-v*) $(wildcard $(d)/gx-go-v*) $(d)/tmp diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index 494d30fd6..02676b378 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -35,7 +35,7 @@ def setupStep(nodeLabel, f) { def ps = nodeLabel != 'windows' ? '/' : '\\' def psep = nodeLabel != 'windows' ? ':' : ';' - def root = tool name: '1.9.2', type: 'go' + def root = tool name: '1.10.2', type: 'go' def jobNameArr = "${JOB_NAME}" def jobName = jobNameArr.split("/")[0..1].join(nodeLabel != 'windows' ? '/' : '\\\\').toLowerCase() def subName = jobNameArr.split("/")[2].toLowerCase() @@ -83,6 +83,7 @@ ansiColor('xterm') { withEnv(['TERM=xterm-color']) { 'go vet': { setupStep('linux') { run -> timeout(time: check_timeout, unit: 'MINUTES') { + run 'make gx-deps' run 'go vet ./...' } } diff --git a/circle.yml b/circle.yml index 577e6cbc4..1b4b2712e 100644 --- a/circle.yml +++ b/circle.yml @@ -12,8 +12,8 @@ machine: post: - sudo rm -rf /usr/local/go - - if [ ! -e go1.9.2.linux-amd64.tar.gz ]; then curl -o go1.9.2.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz; fi - - sudo tar -C /usr/local -xzf go1.9.2.linux-amd64.tar.gz + - if [ ! -e go1.10.2.linux-amd64.tar.gz ]; then curl -o go1.10.2.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.10.2.linux-amd64.tar.gz; fi + - sudo tar -C /usr/local -xzf go1.10.2.linux-amd64.tar.gz services: - docker @@ -30,7 +30,7 @@ dependencies: - cd "$HOME/.go_workspace/src/$IMPORT_PATH" && make deps cache_directories: - - ~/go1.9.2.linux-amd64.tar.gz + - ~/go1.10.2.linux-amd64.tar.gz - ~/.go_workspace/src/gx/ipfs test: diff --git a/mk/golang.mk b/mk/golang.mk index 26b1b2eb5..87e5ea3aa 100644 --- a/mk/golang.mk +++ b/mk/golang.mk @@ -1,5 +1,5 @@ # golang utilities -GO_MIN_VERSION = 1.9 +GO_MIN_VERSION = 1.10 # pre-definitions diff --git a/package.json b/package.json index 034471e58..bd5cf7bf6 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ }, "gx": { "dvcsimport": "github.com/ipfs/go-ipfs", - "goversion": "1.9" + "goversion": "1.10" }, "gxDependencies": [ {