update go versions (go1.15, go1.16, go1.17) (#646)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Azure · Aug 23, 2021 · 34360dd · 34360dd
1 parent 76c7860
commit 34360dd
Show file tree

Hide file tree

Showing 30 changed files with 44 additions and 21 deletions.
diff --git a/autorest/adal/go.mod b/autorest/adal/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/go-autorest/autorest/adal
 
-go 1.12
+go 1.15
 
 require (
 	github.com/Azure/go-autorest v14.2.0+incompatible

diff --git a/autorest/adal/go_mod_tidy_hack.go b/autorest/adal/go_mod_tidy_hack.go
@@ -1,3 +1,4 @@
+//go:build modhack
 // +build modhack
 
 package adal

diff --git a/autorest/adal/token_1.13.go b/autorest/adal/token_1.13.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright 2017 Microsoft Corporation

diff --git a/autorest/adal/token_legacy.go b/autorest/adal/token_legacy.go
@@ -1,3 +1,4 @@
+//go:build !go1.13
 // +build !go1.13
 
 // Copyright 2017 Microsoft Corporation

diff --git a/autorest/azure/auth/go.mod b/autorest/azure/auth/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/go-autorest/autorest/azure/auth
 
-go 1.12
+go 1.15
 
 require (
 	github.com/Azure/go-autorest v14.2.0+incompatible

diff --git a/autorest/azure/auth/go_mod_tidy_hack.go b/autorest/azure/auth/go_mod_tidy_hack.go
@@ -1,3 +1,4 @@
+//go:build modhack
 // +build modhack
 
 package auth

diff --git a/autorest/azure/cli/go.mod b/autorest/azure/cli/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/go-autorest/autorest/azure/cli
 
-go 1.12
+go 1.15
 
 require (
 	github.com/Azure/go-autorest v14.2.0+incompatible

diff --git a/autorest/azure/cli/go_mod_tidy_hack.go b/autorest/azure/cli/go_mod_tidy_hack.go
@@ -1,3 +1,4 @@
+//go:build modhack
 // +build modhack
 
 package cli

diff --git a/autorest/date/go.mod b/autorest/date/go.mod
@@ -1,5 +1,5 @@
 module github.com/Azure/go-autorest/autorest/date
 
-go 1.12
+go 1.15
 
 require github.com/Azure/go-autorest v14.2.0+incompatible
diff --git a/autorest/date/go_mod_tidy_hack.go b/autorest/date/go_mod_tidy_hack.go
@@ -1,3 +1,4 @@
+//go:build modhack
 // +build modhack
 
 package date

diff --git a/autorest/date/unixtime_test.go b/autorest/date/unixtime_test.go
@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 package date

diff --git a/autorest/go.mod b/autorest/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/go-autorest/autorest
 
-go 1.12
+go 1.15
 
 require (
 	github.com/Azure/go-autorest v14.2.0+incompatible

diff --git a/autorest/go_mod_tidy_hack.go b/autorest/go_mod_tidy_hack.go
@@ -1,3 +1,4 @@
+//go:build modhack
 // +build modhack
 
 package autorest

diff --git a/autorest/mocks/go.mod b/autorest/mocks/go.mod
@@ -1,5 +1,5 @@
 module github.com/Azure/go-autorest/autorest/mocks
 
-go 1.12
+go 1.15
 
 require github.com/Azure/go-autorest v14.2.0+incompatible
diff --git a/autorest/mocks/go_mod_tidy_hack.go b/autorest/mocks/go_mod_tidy_hack.go
@@ -1,3 +1,4 @@
+//go:build modhack
 // +build modhack
 
 package mocks

diff --git a/autorest/retriablerequest_1.7.go b/autorest/retriablerequest_1.7.go
@@ -1,3 +1,4 @@
+//go:build !go1.8
 // +build !go1.8
 
 // Copyright 2017 Microsoft Corporation

diff --git a/autorest/retriablerequest_1.8.go b/autorest/retriablerequest_1.8.go
@@ -1,3 +1,4 @@
+//go:build go1.8
 // +build go1.8
 
 // Copyright 2017 Microsoft Corporation

diff --git a/autorest/to/go.mod b/autorest/to/go.mod
@@ -1,5 +1,5 @@
 module github.com/Azure/go-autorest/autorest/to
 
-go 1.12
+go 1.15
 
 require github.com/Azure/go-autorest v14.2.0+incompatible
diff --git a/autorest/to/go_mod_tidy_hack.go b/autorest/to/go_mod_tidy_hack.go
@@ -1,3 +1,4 @@
+//go:build modhack
 // +build modhack
 
 package to

diff --git a/autorest/utility_1.13.go b/autorest/utility_1.13.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright 2017 Microsoft Corporation

diff --git a/autorest/utility_1.13_test.go b/autorest/utility_1.13_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright 2017 Microsoft Corporation

diff --git a/autorest/utility_legacy.go b/autorest/utility_legacy.go
@@ -1,3 +1,4 @@
+//go:build !go1.13
 // +build !go1.13
 
 // Copyright 2017 Microsoft Corporation

diff --git a/autorest/validation/go.mod b/autorest/validation/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/go-autorest/autorest/validation
 
-go 1.12
+go 1.15
 
 require (
 	github.com/Azure/go-autorest v14.2.0+incompatible

diff --git a/autorest/validation/go_mod_tidy_hack.go b/autorest/validation/go_mod_tidy_hack.go
@@ -1,3 +1,4 @@
+//go:build modhack
 // +build modhack
 
 package validation

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,4 +1,5 @@
 variables:
+  GO111MODULE: 'auto'
   GOPATH: '$(system.defaultWorkingDirectory)/work'
   sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)'
 
@@ -8,12 +9,16 @@ jobs:
 
     strategy:
       matrix:
-        Linux_Go113:
+        Linux_Go115:
           vm.image: 'ubuntu-18.04'
-          go.version: '1.13'
-        Linux_Go114:
+          go.version: '1.15'
+        Linux_Go116:
           vm.image: 'ubuntu-18.04'
-          go.version: '1.14'
+          go.version: '1.16'
+        Linux_Go117:
+          vm.image: 'ubuntu-18.04'
+          go.version: '1.17'
+          current_go: 'true'
 
     pool:
       vmImage: '$(vm.image)'
@@ -37,11 +42,11 @@ jobs:
           set -e
           curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
           dep ensure -v
-          go install ./vendor/golang.org/x/lint/golint
-          go get github.com/jstemmer/go-junit-report
-          go get github.com/axw/gocov/gocov
-          go get github.com/AlekSi/gocov-xml
-          go get -u github.com/matm/gocov-html
+          GO111MODULE=on go get golang.org/x/lint/golint@latest
+          GO111MODULE=on go get github.com/jstemmer/go-junit-report@latest
+          GO111MODULE=on go get github.com/axw/gocov/gocov@latest
+          GO111MODULE=on go get github.com/AlekSi/gocov-xml@latest
+          GO111MODULE=on go get github.com/matm/gocov-html@latest
         workingDirectory: '$(sdkPath)'
         displayName: 'Install Dependencies'
 
@@ -81,7 +86,7 @@ jobs:
         workingDirectory: '$(sdkPath)'
         displayName: 'Format Check'
         failOnStderr: true
-        condition: succeededOrFailed()
+        condition: and(succeededOrFailed(), eq(variables['current_go'], 'true'))
 
       - script: |
           golint ./autorest/... >&2

diff --git a/logger/go.mod b/logger/go.mod
@@ -1,5 +1,5 @@
 module github.com/Azure/go-autorest/logger
 
-go 1.12
+go 1.15
 
 require github.com/Azure/go-autorest v14.2.0+incompatible
diff --git a/logger/go_mod_tidy_hack.go b/logger/go_mod_tidy_hack.go
@@ -1,3 +1,4 @@
+//go:build modhack
 // +build modhack
 
 package logger

diff --git a/tracing/go.mod b/tracing/go.mod
@@ -1,5 +1,5 @@
 module github.com/Azure/go-autorest/tracing
 
-go 1.12
+go 1.15
 
 require github.com/Azure/go-autorest v14.2.0+incompatible
diff --git a/tracing/go_mod_tidy_hack.go b/tracing/go_mod_tidy_hack.go
@@ -1,3 +1,4 @@
+//go:build modhack
 // +build modhack
 
 package tracing

diff --git a/tracing/opencensus/go.mod b/tracing/opencensus/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/go-autorest/tracing/opencensus
 
-go 1.12
+go 1.15
 
 require (
 	contrib.go.opencensus.io/exporter/ocagent v0.6.0