build: Upgrade Golang to v1.15 (argoproj#5009)

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

.github/workflows/ci-build.yaml

@@ -25,7 +25,7 @@ jobs:
  - name: Setup Golang
  uses: actions/setup-go@v1
  with:
- go-version: "1.13.12"
+ go-version: "1.15.7"
  - name: Add bins to PATH
  run: |
  echo /home/runner/go/bin >> $GITHUB_PATH
@@ -67,7 +67,7 @@ jobs:
  - name: Setup Golang
  uses: actions/setup-go@v1
  with:
- go-version: "1.13.12"
+ go-version: "1.15.7"
  - name: Add bins to PATH
  run: |
  echo /home/runner/go/bin >> $GITHUB_PATH
@@ -128,7 +128,7 @@ jobs:
  - name: Setup Golang
  uses: actions/setup-go@v1
  with:
- go-version: "1.13.12"
+ go-version: "1.15.7"
  - name: Add bins to PATH
  run: |
  echo /home/runner/go/bin >> $GITHUB_PATH

.github/workflows/gh-pages.yaml

@@ -17,7 +17,7 @@ jobs:
  - name: Setup Golang
  uses: actions/setup-go@v1
  with:
- go-version: '1.13.12'
+ go-version: '1.15.7'
  - name: build
  run: |
  pip install mkdocs==1.0.4 mkdocs_material==4.1.1

Dockerfile

@@ -3,7 +3,7 @@
 # Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
 # Also used as the image in CI jobs so needs all dependencies
 ####################################################################################################
-FROM golang:1.13.4 as builder
+FROM golang:1.15.7 as builder
 
 ARG IMAGE_OS=linux
 

Dockerfile.dev

@@ -3,7 +3,7 @@
 # Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
 # Also used as the image in CI jobs so needs all dependencies
 ####################################################################################################
-FROM golang:1.13.4 as builder
+FROM golang:1.15.7 as builder
 
 ARG IMAGE_OS=linux
 ARG IMAGE_ARCH=amd64

Dockerfile.windows

@@ -5,7 +5,7 @@
 ####################################################################################################
 # had issues with official golange image for windows so I'm using plain servercore
 FROM mcr.microsoft.com/windows/servercore:ltsc2019 as builder
-ENV GOLANG_VERSION=1.13.4
+ENV GOLANG_VERSION=1.15.7
 SHELL ["powershell", "-Command"]
 
 ARG IMAGE_OS=windows

Makefile

@@ -130,8 +130,8 @@ define protoc
  [ -e vendor ] || go mod vendor
  protoc \
  -I /usr/local/include \
- -I . \
- -I ./vendor \
+ -I $(CURDIR) \
+ -I $(CURDIR)/vendor \
  -I ${GOPATH}/src \
  -I ${GOPATH}/pkg/mod/github.com/gogo/[email protected]/gogoproto \
  -I ${GOPATH}/pkg/mod/github.com/grpc-ecosystem/[email protected]/third_party/googleapis \
@@ -331,7 +331,7 @@ pkg/apis/workflow/v1alpha1/generated.proto: $(GOPATH)/bin/go-to-protobuf $(PROTO
  --go-header-file=./hack/custom-boilerplate.go.txt \
  --packages=github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1 \
  --apimachinery-packages=+k8s.io/apimachinery/pkg/util/intstr,+k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime/schema,+k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/api/core/v1,k8s.io/api/policy/v1beta1 \
- --proto-import ./vendor
+ --proto-import $(CURDIR)/vendor
  touch pkg/apis/workflow/v1alpha1/generated.proto
  rm -rf v3
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/argoproj/argo/v3
 
-go 1.13
+go 1.15
 
 require (
  bou.ke/staticfiles v0.0.0-20210106104248-dd04075d4104