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.

Sign up for GitHub

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: upgrade golang to 1.17 #2894

Merged
merged 2 commits into from
Oct 5, 2021
Merged

chore: upgrade golang to 1.17 #2894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b3cede
chore: upgrade golang to 1.17
iamhopaul123 Oct 4, 2021
4cc94a3
Update go version for CI
iamhopaul123 Oct 4, 2021
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.17

- name: Set up Node
uses: actions/setup-node@v1
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.17

- name: Set up Node
uses: actions/setup-node@v1
Expand All @@ -57,7 +57,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.17

- name: Set up Node
uses: actions/setup-node@v1
Expand All @@ -76,7 +76,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.17

- name: Check out code
uses: actions/checkout@v2
Expand All @@ -93,7 +93,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.17

- name: Check out code
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .release/buildspec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ phases:
nodejs: 12
commands:
- 'cd $HOME/.goenv && git pull --ff-only && cd -'
- 'goenv install 1.16.6'
- 'goenv global 1.16.6'
- 'goenv install 1.17.1'
- 'goenv global 1.17.1'
pre_build:
commands:
- echo "cd into $CODEBUILD_SRC_DIR"
Expand Down
4 changes: 2 additions & 2 deletions .release/buildspec_e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ phases:
nodejs: 12
commands:
- 'cd $HOME/.goenv && git pull --ff-only && cd -'
- 'goenv install 1.16.6'
- 'goenv global 1.16.6'
- 'goenv install 1.17.1'
- 'goenv global 1.17.1'
pre_build:
commands:
- docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_TOKEN}
Expand Down
4 changes: 2 additions & 2 deletions .release/buildspec_integ.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ phases:
nodejs: 12
commands:
- 'cd $HOME/.goenv && git pull --ff-only && cd -'
- 'goenv install 1.16.6'
- 'goenv global 1.16.6'
- 'goenv install 1.17.1'
- 'goenv global 1.17.1'
build:
commands:
- echo `git rev-parse HEAD` # Do not delete; for pipeline logging purposes
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
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.16 (`go version`).
- Make sure you are using Go 1.17 (`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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16
FROM golang:1.17
# 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/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM docker:stable-dind

ARG GOLANG_VERSION=1.16.6
ARG GOLANG_VERSION=1.17.1

# Docker needs somewhere to put creds from docker login.
RUN wget https://github.com/docker/docker-credential-helpers/releases/download/v0.6.0/docker-credential-pass-v0.6.0-amd64.tar.gz && tar -xf docker-credential-pass-v0.6.0-amd64.tar.gz && chmod +x docker-credential-pass && mv docker-credential-pass /bin
Expand Down
29 changes: 28 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/aws/copilot-cli

go 1.16
go 1.17
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to upgrade all the buildspecs too!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated!


require (
github.com/AlecAivazis/survey/v2 v2.3.2
Expand Down Expand Up @@ -30,3 +30,30 @@ require (
gopkg.in/ini.v1 v1.63.2
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)

require (
github.com/containerd/typeurl v1.0.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/docker v20.10.0-beta1.0.20201110211921-af34b94a78a1+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/mattn/go-colorable v0.1.9 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
golang.org/x/text v0.3.6 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)