diff --git a/.travis.yml b/.travis.yml index c2dc0b4c9aad3b7c6755147882de3b1569e02fd7..a9b9ab576989e70499fdaae08b8d17400acb5c19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ os: language: go go: - - 1.8 + - 1.9 env: - TEST_NO_FUSE=1 TEST_VERBOSE=1 TEST_SUITE=test_go_expensive diff --git a/README.md b/README.md index 5e86920b6206364747ca0b7bcac4b01a67cb22f9..a68f5997157e558c55c8e49900c59dc177108dfa 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ With snap, in any of the [supported Linux distributions](https://snapcraft.io/do #### Install Go -The build process for ipfs requires Go 1.8 or higher. If you don't have it: [Download Go 1.8+](https://golang.org/dl/). +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/). 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`: @@ -148,7 +148,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.8. See above for how to install go. + Ensure that `go version` reports at least 1.9. 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 9d281f50ef2b2ef151471b42011f9e664c600e22..53e7ce643cb367f496c4d66bb0342518c0829885 100644 --- a/bin/Rules.mk +++ b/bin/Rules.mk @@ -1,9 +1,9 @@ include mk/header.mk -dist_root_$(d)=/ipfs/QmR27Do9gqx9VmuQTEX1UGXETSWYJTQzPzxS5FNUnySCv1 +dist_root_$(d)=/ipfs/QmT3CLJKJzWPuN4NAN4LLy69UpKskMF3AuYhXstKdn8V43 -$(d)/gx: $(d)/gx-v0.12.0 -$(d)/gx-go: $(d)/gx-go-v1.5.0 +$(d)/gx: $(d)/gx-v0.12.1 +$(d)/gx-go: $(d)/gx-go-v1.6.0 TGTS_$(d) := $(d)/gx $(d)/gx-go DISTCLEAN += $(wildcard $(d)/gx-v*) $(wildcard $(d)/gx-go-v*) $(d)/tmp diff --git a/ci/Dockerfile.buildenv b/ci/Dockerfile.buildenv index 0545150a3800aaf2dc96cd64894d5de27013803d..ee54869dc76fceb8d41f898a4816efca320f7657 100644 --- a/ci/Dockerfile.buildenv +++ b/ci/Dockerfile.buildenv @@ -1,4 +1,4 @@ -FROM golang:1.8 +FROM golang:1.9 MAINTAINER Jakub Sztandera <kubuxu@ipfs.io> diff --git a/circle.yml b/circle.yml index 5a6290c151f25815009eefcea606ded761b35041..fc7bd918236a4e59c1be9f8d821e4653c4d93f16 100644 --- a/circle.yml +++ b/circle.yml @@ -12,8 +12,8 @@ machine: post: - sudo rm -rf /usr/local/go - - if [ ! -e go1.8.3.linux-amd64.tar.gz ]; then curl -o go1.8.3.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz; fi - - sudo tar -C /usr/local -xzf go1.8.3.linux-amd64.tar.gz + - 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 services: - docker @@ -30,7 +30,7 @@ dependencies: - cd "$HOME/.go_workspace/src/$IMPORT_PATH" && make deps cache_directories: - - ~/go1.8.3.linux-amd64.tar.gz + - ~/go1.9.2.linux-amd64.tar.gz - "$HOME/.go_workspace/src/gx/ipfs" test: diff --git a/mk/golang.mk b/mk/golang.mk index 1abf4eac8b0ae50c71fa45fa1f1fb3eba15aa5ef..d23a2dc3dac5645492a9d6e02e7b1c053d6e89c3 100644 --- a/mk/golang.mk +++ b/mk/golang.mk @@ -1,5 +1,5 @@ # golang utilities -GO_MIN_VERSION = 1.8 +GO_MIN_VERSION = 1.9 # pre-definitions GOCC ?= go diff --git a/package.json b/package.json index 6bb70baba94668a957167735f36d2011c33dd037..026980a0dc6a46e7a04c7fdef7445f6ca19a03e7 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ }, "gx": { "dvcsimport": "github.com/ipfs/go-ipfs", - "goversion": "1.8" + "goversion": "1.9" }, "gxDependencies": [ {