From 849c612fcb7337cd2583d080070c519c8e54ebab Mon Sep 17 00:00:00 2001 From: Horst Gutmann Date: Wed, 11 Oct 2023 15:35:26 +0200 Subject: [PATCH] Chore: Upgrade Go to 1.20.10 (#76355) * [v10.1.x] Chore: Upgrade Go to 1.20.10 * Rebuild .drone.yml --- .drone.yml | 58 ++++++++++----------- .github/workflows/alerting-swagger-gen.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/pr-codeql-analysis-go.yml | 2 +- .github/workflows/publish-kinds-next.yml | 2 +- .github/workflows/publish-kinds-release.yml | 2 +- .github/workflows/verify-kinds.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- scripts/build/ci-build/Dockerfile | 2 +- scripts/drone/utils/images.star | 2 +- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7a2aaf077bbba..b807425d07b0a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -74,7 +74,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - ./bin/build verify-starlark . @@ -313,7 +313,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -399,7 +399,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST" @@ -433,12 +433,12 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.8 + image: golang:1.20.10 name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod failure: ignore - image: golang:1.20.8 + image: golang:1.20.10 name: validate-modfile trigger: event: @@ -494,7 +494,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -903,7 +903,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1123,7 +1123,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - ./bin/build shellcheck @@ -1225,7 +1225,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1533,7 +1533,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1614,7 +1614,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - make gen-go @@ -1628,12 +1628,12 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.8 + image: golang:1.20.10 name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod failure: ignore - image: golang:1.20.8 + image: golang:1.20.10 name: validate-modfile - commands: - ./bin/build verify-drone @@ -1689,7 +1689,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2159,7 +2159,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2502,7 +2502,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -2598,7 +2598,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -2667,7 +2667,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - yarn install --immutable @@ -2732,7 +2732,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - depends_on: - compile-build-cmd @@ -2820,13 +2820,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - ./bin/build whatsnew-checker depends_on: - compile-build-cmd - image: golang:1.20.8 + image: golang:1.20.10 name: whats-new-checker trigger: event: @@ -2928,7 +2928,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3308,7 +3308,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -3620,7 +3620,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4433,7 +4433,7 @@ steps: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.18.3 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM byrnedo/alpine-curl:0.1.8 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.8 + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.10 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM postgres:12.3-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:5.7.39 @@ -4460,7 +4460,7 @@ steps: - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.18.3 - trivy --exit-code 1 --severity HIGH,CRITICAL byrnedo/alpine-curl:0.1.8 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.8 + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.10 - trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack - trivy --exit-code 1 --severity HIGH,CRITICAL postgres:12.3-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:5.7.39 @@ -4512,7 +4512,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.8 + image: golang:1.20.10 name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss @@ -4709,6 +4709,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 01a08fadd5842c5cb67c68e27802ae41be8bd149604c9af7720ef813eee9ec2d +hmac: f0a5f88146d1c12d41c8ddb2d33feea3241d1d4aebd37633aa560d084bc4b5b3 ... diff --git a/.github/workflows/alerting-swagger-gen.yml b/.github/workflows/alerting-swagger-gen.yml index 78c5897f9e8fe..16dc527cb04f9 100644 --- a/.github/workflows/alerting-swagger-gen.yml +++ b/.github/workflows/alerting-swagger-gen.yml @@ -16,7 +16,7 @@ jobs: - name: Set go version uses: actions/setup-go@v4 with: - go-version: '1.20.8' + go-version: '1.20.10' - name: Build swagger run: | make -C pkg/services/ngalert/api/tooling post.json api.json diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4b88167fb8d62..e203569224fda 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: name: Set go version uses: actions/setup-go@v4 with: - go-version: '1.20.8' + go-version: '1.20.10' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/pr-codeql-analysis-go.yml b/.github/workflows/pr-codeql-analysis-go.yml index d852ca0cfe9dd..ace620e4d81b6 100644 --- a/.github/workflows/pr-codeql-analysis-go.yml +++ b/.github/workflows/pr-codeql-analysis-go.yml @@ -23,7 +23,7 @@ jobs: - name: Set go version uses: actions/setup-go@v4 with: - go-version: '1.20.8' + go-version: '1.20.10' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/publish-kinds-next.yml b/.github/workflows/publish-kinds-next.yml index 73f5d63b77b8d..edea64cffb6d2 100644 --- a/.github/workflows/publish-kinds-next.yml +++ b/.github/workflows/publish-kinds-next.yml @@ -20,7 +20,7 @@ jobs: - name: "Setup Go" uses: "actions/setup-go@v4" with: - go-version: '1.20.8' + go-version: '1.20.10' - name: "Verify kinds" run: go run .github/workflows/scripts/kinds/verify-kinds.go diff --git a/.github/workflows/publish-kinds-release.yml b/.github/workflows/publish-kinds-release.yml index 100976168a72c..ff72b5b927cff 100644 --- a/.github/workflows/publish-kinds-release.yml +++ b/.github/workflows/publish-kinds-release.yml @@ -23,7 +23,7 @@ jobs: - name: "Setup Go" uses: "actions/setup-go@v4" with: - go-version: '1.20.8' + go-version: '1.20.10' - name: "Verify kinds" run: go run .github/workflows/scripts/kinds/verify-kinds.go diff --git a/.github/workflows/verify-kinds.yml b/.github/workflows/verify-kinds.yml index 176b07d9a6d52..d8dcd1d07c913 100644 --- a/.github/workflows/verify-kinds.yml +++ b/.github/workflows/verify-kinds.yml @@ -18,7 +18,7 @@ jobs: - name: "Setup Go" uses: "actions/setup-go@v4" with: - go-version: '1.20.8' + go-version: '1.20.10' - name: "Verify kinds" run: go run .github/workflows/scripts/kinds/verify-kinds.go diff --git a/Dockerfile b/Dockerfile index d2a8abea778e9..3d7508beae9fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=alpine:3.18.3 ARG JS_IMAGE=node:18-alpine3.18 ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.20.8-alpine3.18 +ARG GO_IMAGE=golang:1.20.10-alpine3.18 ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/Makefile b/Makefile index f07793b0f40e9..ceeb2673befab 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development. --build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \ --build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \ --build-arg BASE_IMAGE=ubuntu:20.04 \ - --build-arg GO_IMAGE=golang:1.20.8 \ + --build-arg GO_IMAGE=golang:1.20.10 \ --tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \ $(DOCKER_BUILD_ARGS) diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index f1c544676fe9c..a504b12f1c229 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -108,7 +108,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz # Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's. FROM debian:buster-20220822 -ENV GOVERSION=1.20.8 \ +ENV GOVERSION=1.20.10 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ NODEVERSION=18.12.0-1nodesource1 \ diff --git a/scripts/drone/utils/images.star b/scripts/drone/utils/images.star index 73f12bd0b9aa7..b621583366a8c 100644 --- a/scripts/drone/utils/images.star +++ b/scripts/drone/utils/images.star @@ -8,7 +8,7 @@ images = { "publish_image": "grafana/grafana-ci-deploy:1.3.3", "alpine_image": "alpine:3.18.3", "curl_image": "byrnedo/alpine-curl:0.1.8", - "go_image": "golang:1.20.8", + "go_image": "golang:1.20.10", "plugins_slack_image": "plugins/slack", "postgres_alpine_image": "postgres:12.3-alpine", "mysql5_image": "mysql:5.7.39",