提交 22a25ef1 作者: Łukasz Magiera 提交者: Steven Allen

switch minimum go version to go 1.10

License: MIT
Signed-off-by: 's avatarŁukasz Magiera <magik6k@gmail.com>
Signed-off-by: 's avatarVictor Bjelkholm <git@victor.earth>
Signed-off-by: 's avatarSteven Allen <steven@stebalien.com>
上级 b3faaad1
...@@ -10,7 +10,7 @@ os: ...@@ -10,7 +10,7 @@ os:
language: go language: go
go: go:
- 1.9 - 1.10.2
env: env:
- TEST_NO_FUSE=1 TEST_VERBOSE=1 TEST_SUITE=test_go_expensive - TEST_NO_FUSE=1 TEST_VERBOSE=1 TEST_SUITE=test_go_expensive
......
FROM golang:1.9-stretch FROM golang:1.10-stretch
MAINTAINER Lars Gierth <lgierth@ipfs.io> MAINTAINER Lars Gierth <lgierth@ipfs.io>
# There is a copy of this Dockerfile called Dockerfile.fast, # There is a copy of this Dockerfile called Dockerfile.fast,
......
FROM golang:1.9-stretch FROM golang:1.10-stretch
MAINTAINER Lars Gierth <lgierth@ipfs.io> MAINTAINER Lars Gierth <lgierth@ipfs.io>
# This is a copy of /Dockerfile, # This is a copy of /Dockerfile,
......
...@@ -103,7 +103,7 @@ With snap, in any of the [supported Linux distributions](https://snapcraft.io/do ...@@ -103,7 +103,7 @@ With snap, in any of the [supported Linux distributions](https://snapcraft.io/do
#### Install Go #### 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`: 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. ...@@ -147,7 +147,7 @@ mismatched APIs.
* Also, [instructions for OpenBSD](docs/openbsd.md). * Also, [instructions for OpenBSD](docs/openbsd.md).
* `git` is required in order for `go get` to fetch all dependencies. * `git` is required in order for `go get` to fetch all dependencies.
* Package managers often contain out-of-date `golang` packages. * 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 * If you are interested in development, please install the development
dependencies as well. dependencies as well.
* *WARNING: Older versions of OSX FUSE (for Mac OS X) can cause kernel panics when mounting!* * *WARNING: Older versions of OSX FUSE (for Mac OS X) can cause kernel panics when mounting!*
......
include mk/header.mk include mk/header.mk
dist_root_$(d)=/ipfs/QmT3CLJKJzWPuN4NAN4LLy69UpKskMF3AuYhXstKdn8V43 dist_root_$(d)="/ipfs/QmXtsjCX29kcdeSjrijWiFTK1qwQNW8UrEWDi8okuC2Pog"
$(d)/gx: $(d)/gx-v0.12.1 $(d)/gx: $(d)/gx-v0.13.0
$(d)/gx-go: $(d)/gx-go-v1.6.0 $(d)/gx-go: $(d)/gx-go-v1.7.0
TGTS_$(d) := $(d)/gx $(d)/gx-go TGTS_$(d) := $(d)/gx $(d)/gx-go
DISTCLEAN += $(wildcard $(d)/gx-v*) $(wildcard $(d)/gx-go-v*) $(d)/tmp DISTCLEAN += $(wildcard $(d)/gx-v*) $(wildcard $(d)/gx-go-v*) $(d)/tmp
......
...@@ -35,7 +35,7 @@ def setupStep(nodeLabel, f) { ...@@ -35,7 +35,7 @@ def setupStep(nodeLabel, f) {
def ps = nodeLabel != 'windows' ? '/' : '\\' def ps = nodeLabel != 'windows' ? '/' : '\\'
def psep = 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 jobNameArr = "${JOB_NAME}"
def jobName = jobNameArr.split("/")[0..1].join(nodeLabel != 'windows' ? '/' : '\\\\').toLowerCase() def jobName = jobNameArr.split("/")[0..1].join(nodeLabel != 'windows' ? '/' : '\\\\').toLowerCase()
def subName = jobNameArr.split("/")[2].toLowerCase() def subName = jobNameArr.split("/")[2].toLowerCase()
...@@ -83,6 +83,7 @@ ansiColor('xterm') { withEnv(['TERM=xterm-color']) { ...@@ -83,6 +83,7 @@ ansiColor('xterm') { withEnv(['TERM=xterm-color']) {
'go vet': { 'go vet': {
setupStep('linux') { run -> setupStep('linux') { run ->
timeout(time: check_timeout, unit: 'MINUTES') { timeout(time: check_timeout, unit: 'MINUTES') {
run 'make gx-deps'
run 'go vet ./...' run 'go vet ./...'
} }
} }
......
...@@ -12,8 +12,8 @@ machine: ...@@ -12,8 +12,8 @@ machine:
post: post:
- sudo rm -rf /usr/local/go - 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 - 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.9.2.linux-amd64.tar.gz - sudo tar -C /usr/local -xzf go1.10.2.linux-amd64.tar.gz
services: services:
- docker - docker
...@@ -30,7 +30,7 @@ dependencies: ...@@ -30,7 +30,7 @@ dependencies:
- cd "$HOME/.go_workspace/src/$IMPORT_PATH" && make deps - cd "$HOME/.go_workspace/src/$IMPORT_PATH" && make deps
cache_directories: cache_directories:
- ~/go1.9.2.linux-amd64.tar.gz - ~/go1.10.2.linux-amd64.tar.gz
- ~/.go_workspace/src/gx/ipfs - ~/.go_workspace/src/gx/ipfs
test: test:
......
# golang utilities # golang utilities
GO_MIN_VERSION = 1.9 GO_MIN_VERSION = 1.10
# pre-definitions # pre-definitions
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
}, },
"gx": { "gx": {
"dvcsimport": "github.com/ipfs/go-ipfs", "dvcsimport": "github.com/ipfs/go-ipfs",
"goversion": "1.9" "goversion": "1.10"
}, },
"gxDependencies": [ "gxDependencies": [
{ {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论