From 5a62025cc70a4b352f1d76f0041b638f076e9b7d Mon Sep 17 00:00:00 2001 From: Adin Schmahmann Date: Thu, 25 Feb 2021 16:33:03 -0500 Subject: [PATCH 1/3] chore: bump minimum go version to 1.15 --- .circleci/config.yml | 4 ++-- README.md | 4 ++-- go.mod | 2 +- mk/golang.mk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8891a342da8..028d1a525c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,7 @@ default_environment: &default_environment executors: golang: docker: - - image: circleci/golang:1.14.4 + - image: circleci/golang:1.15.8 working_directory: ~/ipfs/go-ipfs environment: <<: *default_environment @@ -60,7 +60,7 @@ executors: E2E_IPFSD_TYPE: go dockerizer: docker: - - image: circleci/golang:1.14.4 + - image: circleci/golang:1.15.8 environment: IMAGE_NAME: ipfs/go-ipfs WIP_IMAGE_TAG: wip diff --git a/README.md b/README.md index 2dafe8a739c..80539a73e67 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,7 @@ PS> scoop install go-ipfs ### Build from Source -go-ipfs's build system requires Go 1.14.4 and some standard POSIX build tools: +go-ipfs's build system requires Go 1.15.8 and some standard POSIX build tools: * GNU make * Git @@ -170,7 +170,7 @@ To build without GCC, build with `CGO_ENABLED=0` (e.g., `make build CGO_ENABLED= #### Install Go -The build process for ipfs requires Go 1.14.4 or higher. If you don't have it: [Download Go 1.14+](https://golang.org/dl/). +The build process for ipfs requires Go 1.15.8 or higher. If you don't have it: [Download Go 1.15+](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`: diff --git a/go.mod b/go.mod index 7c404c35045..03dffcc82da 100644 --- a/go.mod +++ b/go.mod @@ -108,4 +108,4 @@ require ( golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6 ) -go 1.14 +go 1.15 diff --git a/mk/golang.mk b/mk/golang.mk index 210af085991..50bf4ce3cf5 100644 --- a/mk/golang.mk +++ b/mk/golang.mk @@ -1,5 +1,5 @@ # golang utilities -GO_MIN_VERSION = 1.14.4 +GO_MIN_VERSION = 1.15.8 export GO111MODULE=on From a81718f20a66012128464106c6b06ccf78b36f99 Mon Sep 17 00:00:00 2001 From: Adin Schmahmann Date: Wed, 12 May 2021 17:20:44 -0400 Subject: [PATCH 2/3] bump dockerfile to Go 1.15.8 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7e10ea753b1..a11937dea0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Note: when updating the go minor version here, also update the go-channel in snap/snapcraft.yml -FROM golang:1.14.4-buster +FROM golang:1.15.8-buster LABEL maintainer="Steven Allen " # Install deps From 73e7e023c0620e6180828946c88e147dad1fc1d8 Mon Sep 17 00:00:00 2001 From: Adin Schmahmann Date: Wed, 12 May 2021 17:59:20 -0400 Subject: [PATCH 3/3] downgrade to 1.15.2 --- .circleci/config.yml | 4 ++-- Dockerfile | 2 +- README.md | 4 ++-- mk/golang.mk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 028d1a525c6..8636cb9f98e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,7 @@ default_environment: &default_environment executors: golang: docker: - - image: circleci/golang:1.15.8 + - image: circleci/golang:1.15.2 working_directory: ~/ipfs/go-ipfs environment: <<: *default_environment @@ -60,7 +60,7 @@ executors: E2E_IPFSD_TYPE: go dockerizer: docker: - - image: circleci/golang:1.15.8 + - image: circleci/golang:1.15.2 environment: IMAGE_NAME: ipfs/go-ipfs WIP_IMAGE_TAG: wip diff --git a/Dockerfile b/Dockerfile index a11937dea0c..113c6599db1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Note: when updating the go minor version here, also update the go-channel in snap/snapcraft.yml -FROM golang:1.15.8-buster +FROM golang:1.15.2-buster LABEL maintainer="Steven Allen " # Install deps diff --git a/README.md b/README.md index 80539a73e67..67f229ee041 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,7 @@ PS> scoop install go-ipfs ### Build from Source -go-ipfs's build system requires Go 1.15.8 and some standard POSIX build tools: +go-ipfs's build system requires Go 1.15.2 and some standard POSIX build tools: * GNU make * Git @@ -170,7 +170,7 @@ To build without GCC, build with `CGO_ENABLED=0` (e.g., `make build CGO_ENABLED= #### Install Go -The build process for ipfs requires Go 1.15.8 or higher. If you don't have it: [Download Go 1.15+](https://golang.org/dl/). +The build process for ipfs requires Go 1.15.2 or higher. If you don't have it: [Download Go 1.15+](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`: diff --git a/mk/golang.mk b/mk/golang.mk index 50bf4ce3cf5..0b2a2c55ae2 100644 --- a/mk/golang.mk +++ b/mk/golang.mk @@ -1,5 +1,5 @@ # golang utilities -GO_MIN_VERSION = 1.15.8 +GO_MIN_VERSION = 1.15.2 export GO111MODULE=on