From 7ef17da54c60e088f3f5f4f40b5d8b4f40563b01 Mon Sep 17 00:00:00 2001 From: Hsing-Hui Hsu Date: Thu, 11 Mar 2021 10:59:50 -0800 Subject: [PATCH 1/2] chore: bump to go 1.15 --- CONTRIBUTING.md | 2 +- Dockerfile | 2 +- e2e/addons/hello/Dockerfile | 2 +- e2e/addons/hello/go.mod | 2 +- e2e/multi-svc-app/back-end/Dockerfile | 2 +- e2e/multi-svc-app/back-end/go.mod | 2 +- e2e/multi-svc-app/front-end/Dockerfile | 2 +- e2e/multi-svc-app/front-end/go.mod | 2 +- e2e/multi-svc-app/www/Dockerfile | 2 +- e2e/multi-svc-app/www/go.mod | 2 +- go.mod | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c762fcbe77e..70942e57cb1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,7 @@ Please read it over and let us know if it's not up-to-date (or, even better, sub ### Environment -- Make sure you are using Go 1.14 (`go version`). +- Make sure you are using Go 1.15 (`go version`). - Fork the repository. - Clone your forked repository locally. - We use Go Modules to manage dependencies, so you can develop outside of your $GOPATH. diff --git a/Dockerfile b/Dockerfile index de0cd05675a..ed4741e9673 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14 +FROM golang:1.15 # We need to have both nodejs and go to build the binaries. # We could use multi-stage builds but that would require significantly changing our Makefile. RUN apt-get update diff --git a/e2e/addons/hello/Dockerfile b/e2e/addons/hello/Dockerfile index 440619fb83b..2ec7f311039 100644 --- a/e2e/addons/hello/Dockerfile +++ b/e2e/addons/hello/Dockerfile @@ -1,6 +1,6 @@ # We specify the base image we need for our # go application -FROM golang:1.14 AS builder +FROM golang:1.15 AS builder # We create an /app directory within our # image that will hold our application source # files diff --git a/e2e/addons/hello/go.mod b/e2e/addons/hello/go.mod index 120310b16eb..9959a7de8d2 100644 --- a/e2e/addons/hello/go.mod +++ b/e2e/addons/hello/go.mod @@ -1,6 +1,6 @@ module hello -go 1.14 +go 1.15 require ( github.com/aws/aws-sdk-go v1.29.22 // indirect diff --git a/e2e/multi-svc-app/back-end/Dockerfile b/e2e/multi-svc-app/back-end/Dockerfile index 03e109bc813..e777a608f7f 100644 --- a/e2e/multi-svc-app/back-end/Dockerfile +++ b/e2e/multi-svc-app/back-end/Dockerfile @@ -1,6 +1,6 @@ # We specify the base image we need for our # go application -FROM golang:1.14 AS builder +FROM golang:1.15 AS builder # We create an /app directory within our # image that will hold our application source # files diff --git a/e2e/multi-svc-app/back-end/go.mod b/e2e/multi-svc-app/back-end/go.mod index e8f441441da..9c9d214a37e 100644 --- a/e2e/multi-svc-app/back-end/go.mod +++ b/e2e/multi-svc-app/back-end/go.mod @@ -1,5 +1,5 @@ module github.com/aws/copilot-cli/e2e/multi-app-project/back-end -go 1.14 +go 1.15 require github.com/julienschmidt/httprouter v1.3.0 // indirect diff --git a/e2e/multi-svc-app/front-end/Dockerfile b/e2e/multi-svc-app/front-end/Dockerfile index 5dd5e581f9e..5fe0aa623fb 100644 --- a/e2e/multi-svc-app/front-end/Dockerfile +++ b/e2e/multi-svc-app/front-end/Dockerfile @@ -1,6 +1,6 @@ # We specify the base image we need for our # go application -FROM golang:1.14 AS builder +FROM golang:1.15 AS builder # We create an /app directory within our # image that will hold our application source # files diff --git a/e2e/multi-svc-app/front-end/go.mod b/e2e/multi-svc-app/front-end/go.mod index f56da37bdd8..87adabf6dde 100644 --- a/e2e/multi-svc-app/front-end/go.mod +++ b/e2e/multi-svc-app/front-end/go.mod @@ -1,5 +1,5 @@ module github.com/aws/copilot-cli/e2e/multi-app-project/front-end -go 1.14 +go 1.15 require github.com/julienschmidt/httprouter v1.3.0 diff --git a/e2e/multi-svc-app/www/Dockerfile b/e2e/multi-svc-app/www/Dockerfile index 3790669bfc8..8710a10b36b 100644 --- a/e2e/multi-svc-app/www/Dockerfile +++ b/e2e/multi-svc-app/www/Dockerfile @@ -1,6 +1,6 @@ # We specify the base image we need for our # go application -FROM golang:1.14 AS builder +FROM golang:1.15 AS builder # We create an /app directory within our # image that will hold our application source # files diff --git a/e2e/multi-svc-app/www/go.mod b/e2e/multi-svc-app/www/go.mod index cae8917f84e..a34070d6f3d 100644 --- a/e2e/multi-svc-app/www/go.mod +++ b/e2e/multi-svc-app/www/go.mod @@ -1,5 +1,5 @@ module github.com/aws/copilot-cli/e2e/multi-app-project/www -go 1.14 +go 1.15 require github.com/julienschmidt/httprouter v1.3.0 diff --git a/go.mod b/go.mod index 151c6a85ef1..23c52dab5cf 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aws/copilot-cli -go 1.14 +go 1.15 require ( github.com/AlecAivazis/survey/v2 v2.2.8 From f2f0ec3ff4c2f7e80a742e2c68d1498a06412e14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 19:12:03 +0000 Subject: [PATCH 2/2] chore: Bump github.com/imdario/mergo from 0.3.9 to 0.3.12 Bumps [github.com/imdario/mergo](https://github.com/imdario/mergo) from 0.3.9 to 0.3.12. - [Release notes](https://github.com/imdario/mergo/releases) - [Commits](https://github.com/imdario/mergo/compare/v0.3.9...0.3.12) Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 23c52dab5cf..393810f7cb0 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/google/uuid v1.2.0 github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c // indirect - github.com/imdario/mergo v0.3.9 + github.com/imdario/mergo v0.3.12 github.com/lnquy/cron v1.1.1 github.com/moby/buildkit v0.8.2 github.com/onsi/ginkgo v1.15.1 diff --git a/go.sum b/go.sum index 45bc61fde5f..1eca3d78ebc 100644 --- a/go.sum +++ b/go.sum @@ -530,6 +530,8 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg=