Unverified 提交 0f3485e2 作者: Steven Allen 提交者: GitHub

Merge pull request #5483 from ipfs/feat/go1.11

switch to go 1.11
......@@ -10,7 +10,7 @@ os:
language: go
go:
- 1.10.2
- 1.11
env:
- TEST_NO_FUSE=1 TEST_VERBOSE=1 TEST_SUITE=test_go_expensive
......
FROM golang:1.10-stretch
FROM golang:1.11-stretch
MAINTAINER Lars Gierth <lgierth@ipfs.io>
# There is a copy of this Dockerfile called Dockerfile.fast,
......
FROM golang:1.10-stretch
FROM golang:1.11-stretch
MAINTAINER Lars Gierth <lgierth@ipfs.io>
# This is a copy of /Dockerfile,
......
include mk/header.mk
dist_root_$(d)="/ipfs/QmYpvspyyUWQTE226NFWteXYJF3x3br25xmB6XzEoqfzyv"
dist_root_$(d)="/ipfs/QmPrXH9jRVwvd7r5MC5e6nV4uauQGzLk1i2647Ye9Vbbwe"
$(d)/gx: $(d)/gx-v0.13.0
$(d)/gx-go: $(d)/gx-go-v1.7.0
$(d)/gx: $(d)/gx-v0.14.0
$(d)/gx-go: $(d)/gx-go-v1.9.0
TGTS_$(d) := $(d)/gx $(d)/gx-go
DISTCLEAN += $(wildcard $(d)/gx-v*) $(wildcard $(d)/gx-go-v*) $(d)/tmp
......
FROM golang:1.10
FROM golang:1.11
MAINTAINER Jakub Sztandera <kubuxu@ipfs.io>
......
......@@ -35,7 +35,7 @@ def setupStep(nodeLabel, f) {
def ps = nodeLabel != 'windows' ? '/' : '\\'
def psep = nodeLabel != 'windows' ? ':' : ';'
def root = tool name: '1.10.2', type: 'go'
def root = tool name: '1.11', type: 'go'
def jobNameArr = "${JOB_NAME}"
def jobName = jobNameArr.split("/")[0..1].join(nodeLabel != 'windows' ? '/' : '\\\\').toLowerCase()
def subName = jobNameArr.split("/")[2].toLowerCase()
......
......@@ -12,8 +12,8 @@ machine:
post:
- sudo rm -rf /usr/local/go
- 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
- if [ ! -e go1.11.linux-amd64.tar.gz ]; then curl -o go1.11.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.11.linux-amd64.tar.gz; fi
- sudo tar -C /usr/local -xzf go1.11.linux-amd64.tar.gz
services:
- docker
......@@ -30,7 +30,7 @@ dependencies:
- cd "$HOME/.go_workspace/src/$IMPORT_PATH" && make deps
cache_directories:
- ~/go1.10.2.linux-amd64.tar.gz
- ~/go1.11.linux-amd64.tar.gz
- ~/.go_workspace/src/gx/ipfs
test:
......
......@@ -290,9 +290,9 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
// Start assembling node config
ncfg := &core.BuildCfg{
Repo: repo,
Permanent: true, // It is temporary way to signify that node is permanent
Online: !offline,
Repo: repo,
Permanent: true, // It is temporary way to signify that node is permanent
Online: !offline,
DisableEncryptedConnections: unencrypted,
ExtraOpts: map[string]bool{
"pubsub": pubsub,
......
# golang utilities
GO_MIN_VERSION = 1.10
GO_MIN_VERSION = 1.11
# pre-definitions
......
......@@ -4,7 +4,7 @@
},
"gx": {
"dvcsimport": "github.com/ipfs/go-ipfs",
"goversion": "1.10"
"goversion": "1.11"
},
"gxDependencies": [
{
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论