Skip to content

Commit

Permalink
feat!: Upgrade to Golang 1.16. Fixes argoproj#5563 (argoproj#6471)
Browse files Browse the repository at this point in the history
* feat!: Upgrade to Golang 1.16. Fixes argoproj#5563

Signed-off-by: Alex Collins <[email protected]>

* make lint

Signed-off-by: Alex Collins <[email protected]>
  • Loading branch information
alexec authored Aug 3, 2021
1 parent 9424424 commit 7f2c589
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: "1.15.7"
go-version: "1.16"
- uses: actions/cache@v2
with:
path: /home/runner/.cache/go-build
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: "1.15.7"
go-version: "1.16"
- uses: actions/cache@v2
with:
path: /home/runner/.cache/go-build
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: "1.15.7"
go-version: "1.16"
- uses: actions/cache@v2
with:
path: /home/runner/.cache/go-build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v1
with:
go-version: '1.15.7'
go-version: '1.16'
- name: build
run: |
pip install mkdocs==1.0.4 mkdocs_material==4.1.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ jobs:
key: ${{ runner.os }}-node-dep-v1-${{ hashFiles('**/yarn.lock') }}
- uses: actions/setup-go@v2
with:
go-version: "1.15.7"
go-version: "1.16"
- uses: actions/cache@v2
with:
path: /home/runner/.cache/go-build
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG DOCKER_VERSION=18.09.1
ARG KUBECTL_VERSION=1.19.6
ARG JQ_VERSION=1.6

FROM docker.io/library/golang:1.15.7 as builder
FROM docker.io/library/golang:1.16 as builder

RUN apt-get update && apt-get --no-install-recommends install -y \
git \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG IMAGE_OS_VERSION=1809

# had issues with official golange image for windows so I'm using plain servercore
FROM mcr.microsoft.com/windows/servercore:${IMAGE_OS_VERSION} as builder
ENV GOLANG_VERSION=1.15.7
ENV GOLANG_VERSION=1.16
SHELL ["powershell", "-Command"]

# install chocolatey package manager
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ dist/argosay:

.PHONY: pull-images
pull-images:
docker pull golang:1.15.7
docker pull golang:1.16
docker pull debian:10.7-slim
docker pull mysql:8
docker pull argoproj/argosay:v1
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/argoproj/argo-workflows/v3

go 1.15
go 1.16

require (
cloud.google.com/go v0.55.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
Expand Down Expand Up @@ -643,7 +642,6 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM=
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
github.com/karrick/godirwalk v1.7.8/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
Expand Down

0 comments on commit 7f2c589

Please sign in to comment.