From 8b573dc77183123c528ca83e359477f527a70346 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 17 Sep 2018 11:56:51 -0700 Subject: [PATCH 1/3] switch to go 1.11 Go 1.11 changes the output of `go fmt` slightly so we either need to all *downgrade* or *upgrade*. Let's upgrade. License: MIT Signed-off-by: Steven Allen --- .travis.yml | 2 +- Dockerfile | 2 +- Dockerfile.fast | 2 +- ci/Dockerfile.buildenv | 2 +- ci/Jenkinsfile | 2 +- circle.yml | 6 +++--- mk/golang.mk | 2 +- package.json | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index a040ea819e5..a15098df7b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/Dockerfile b/Dockerfile index 3246f2c0bf8..bffafe0c665 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.10-stretch +FROM golang:1.11-stretch MAINTAINER Lars Gierth # There is a copy of this Dockerfile called Dockerfile.fast, diff --git a/Dockerfile.fast b/Dockerfile.fast index e4266cb21b3..0c03328eb21 100644 --- a/Dockerfile.fast +++ b/Dockerfile.fast @@ -1,4 +1,4 @@ -FROM golang:1.10-stretch +FROM golang:1.11-stretch MAINTAINER Lars Gierth # This is a copy of /Dockerfile, diff --git a/ci/Dockerfile.buildenv b/ci/Dockerfile.buildenv index f245c346b4b..d5864d7817a 100644 --- a/ci/Dockerfile.buildenv +++ b/ci/Dockerfile.buildenv @@ -1,4 +1,4 @@ -FROM golang:1.10 +FROM golang:1.11 MAINTAINER Jakub Sztandera diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index b735597157b..59ae86a8b2f 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.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() diff --git a/circle.yml b/circle.yml index 1b4b2712eb6..75a31c1d6ff 100644 --- a/circle.yml +++ b/circle.yml @@ -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: diff --git a/mk/golang.mk b/mk/golang.mk index 6ed499ad48f..c2886e1022d 100644 --- a/mk/golang.mk +++ b/mk/golang.mk @@ -1,5 +1,5 @@ # golang utilities -GO_MIN_VERSION = 1.10 +GO_MIN_VERSION = 1.11 # pre-definitions diff --git a/package.json b/package.json index c1979994f70..15dd8850877 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ }, "gx": { "dvcsimport": "github.com/ipfs/go-ipfs", - "goversion": "1.10" + "goversion": "1.11" }, "gxDependencies": [ { From 202537753607e37a5156fdb60db7a0353fcf2e10 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 17 Sep 2018 11:58:03 -0700 Subject: [PATCH 2/3] go fmt License: MIT Signed-off-by: Steven Allen --- cmd/ipfs/daemon.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index afcef28f326..e70f8ffe053 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -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, From 5f1b79636546949849d251971108f0dee1627aa8 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 8 Oct 2018 17:07:50 -0700 Subject: [PATCH 3/3] upgrade gx/gx-go License: MIT Signed-off-by: Steven Allen --- bin/Rules.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/Rules.mk b/bin/Rules.mk index 93ee8b9210e..734877629e6 100644 --- a/bin/Rules.mk +++ b/bin/Rules.mk @@ -1,9 +1,9 @@ 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