Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Bump github.com/imdario/mergo from 0.3.9 to 0.3.12 #81

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/addons/hello/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/addons/hello/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module hello

go 1.14
go 1.15

require (
github.com/aws/aws-sdk-go v1.29.22 // indirect
Expand Down
2 changes: 1 addition & 1 deletion e2e/multi-svc-app/back-end/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/multi-svc-app/back-end/go.mod
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion e2e/multi-svc-app/front-end/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/multi-svc-app/front-end/go.mod
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion e2e/multi-svc-app/www/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/multi-svc-app/www/go.mod
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down