diff --git a/.travis.yml b/.travis.yml index a040ea819..a15098df7 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 3246f2c0b..bffafe0c6 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 e4266cb21..0c03328eb 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 f245c346b..d5864d781 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 b73559715..59ae86a8b 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 1b4b2712e..75a31c1d6 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 6ed499ad4..c2886e102 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 c1979994f..15dd88508 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": [ {