From e25096ada077b066a4448d9e99b6973902221236 Mon Sep 17 00:00:00 2001 From: Owais Lone Date: Sat, 24 Apr 2021 04:13:27 +0530 Subject: [PATCH] Upgrade to Go1.16 --- .circleci/config.yml | 8 ++++---- .github/workflows/build-and-test.yml | 22 +++++++++++----------- .github/workflows/contrib-tests.yml | 2 +- CONTRIBUTING.md | 2 +- cmd/checkdoc/go.mod | 2 +- cmd/issuegenerator/go.mod | 2 +- cmd/mdatagen/go.mod | 2 +- examples/demo/app/go.mod | 2 +- go.mod | 2 +- internal/tools/go.mod | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 113643b15fc..227ed12106a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ orbs: executors: golang: docker: - - image: cimg/go:1.15 + - image: cimg/go:1.16 commands: verify_dist_files_exist: @@ -310,7 +310,7 @@ jobs: publish-check: docker: - - image: cimg/go:1.15 + - image: cimg/go:1.16 steps: - attach_to_workspace - setup_remote_docker @@ -326,7 +326,7 @@ jobs: publish-stable: docker: - - image: cimg/go:1.15 + - image: cimg/go:1.16 steps: - attach_to_workspace - verify_dist_files_exist @@ -347,7 +347,7 @@ jobs: publish-dev: docker: - - image: cimg/go:1.15 + - image: cimg/go:1.16 steps: - attach_to_workspace - verify_dist_files_exist diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 32123628d6d..0518c41dd53 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2.1.3 with: - go-version: 1.15 + go-version: 1.16 - name: Setup Go Environment run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV @@ -48,7 +48,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2.1.3 with: - go-version: 1.15 + go-version: 1.16 - name: Setup Go Environment run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV @@ -91,7 +91,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2.1.3 with: - go-version: 1.15 + go-version: 1.16 - name: Setup Go Environment run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV @@ -133,7 +133,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2.1.3 with: - go-version: 1.15 + go-version: 1.16 - name: Setup Go Environment run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV @@ -177,7 +177,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2.1.3 with: - go-version: 1.15 + go-version: 1.16 - name: Setup Go Environment run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV @@ -221,7 +221,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2.1.3 with: - go-version: 1.15 + go-version: 1.16 - name: Setup Go Environment run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV @@ -273,7 +273,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2.1.3 with: - go-version: 1.15 + go-version: 1.16 - name: Setup Go Environment run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV @@ -317,7 +317,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2.1.3 with: - go-version: 1.15 + go-version: 1.16 - name: Setup Go Environment run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV @@ -373,7 +373,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2.1.3 with: - go-version: 1.15 + go-version: 1.16 - name: Setup Go Environment run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV @@ -408,7 +408,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2.1.3 with: - go-version: 1.15 + go-version: 1.16 - name: Setup Go Environment run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV @@ -468,7 +468,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2.1.3 with: - go-version: 1.15 + go-version: 1.16 - name: Setup Go Environment run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV diff --git a/.github/workflows/contrib-tests.yml b/.github/workflows/contrib-tests.yml index 93b629b0bf7..5e6b3123bb4 100644 --- a/.github/workflows/contrib-tests.yml +++ b/.github/workflows/contrib-tests.yml @@ -10,7 +10,7 @@ jobs: contrib_tests: runs-on: ubuntu-latest container: - image: cimg/go:1.15 + image: cimg/go:1.16 steps: - name: Setup Permissions run: sudo chmod -R 777 $GITHUB_WORKSPACE /github /__w/_temp diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b4f3dd92180..3d2cd1538a2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -107,7 +107,7 @@ section of general project contributing guide. Working with the project sources requires the following tools: 1. [git](https://git-scm.com/) -2. [go](https://golang.org/) (version 1.15 and up) +2. [go](https://golang.org/) (version 1.16 and up) 3. [make](https://www.gnu.org/software/make/) 4. [docker](https://www.docker.com/) diff --git a/cmd/checkdoc/go.mod b/cmd/checkdoc/go.mod index 03693407ca3..e2061cd9571 100644 --- a/cmd/checkdoc/go.mod +++ b/cmd/checkdoc/go.mod @@ -1,5 +1,5 @@ module go.opentelemetry.io/collector/cmd/checkdoc -go 1.15 +go 1.16 require github.com/stretchr/testify v1.7.0 diff --git a/cmd/issuegenerator/go.mod b/cmd/issuegenerator/go.mod index cad0c4d591b..3b1f92b02be 100644 --- a/cmd/issuegenerator/go.mod +++ b/cmd/issuegenerator/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/cmd/issuegenerator -go 1.15 +go 1.16 require ( github.com/google/go-github v17.0.0+incompatible diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 65f5d813993..4bfdd7f1f9d 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/cmd/mdatagen -go 1.15 +go 1.16 require ( github.com/go-playground/locales v0.13.0 diff --git a/examples/demo/app/go.mod b/examples/demo/app/go.mod index f8fc2e45ed6..008fb2b124f 100644 --- a/examples/demo/app/go.mod +++ b/examples/demo/app/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/examples/demo/app -go 1.15 +go 1.16 require ( github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/go.mod b/go.mod index db129f130c0..715a065d7fa 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector -go 1.15 +go 1.16 require ( contrib.go.opencensus.io/exporter/prometheus v0.3.0 diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 3d477479d30..ea1455bb0fb 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/internal/tools -go 1.15 +go 1.16 require ( github.com/client9/misspell v0.3.4