From d24c8aa3152ba3625de484d93e1c7d7b0f0fea94 Mon Sep 17 00:00:00 2001 From: Horst Gutmann Date: Wed, 11 Oct 2023 17:03:42 +0200 Subject: [PATCH] [v9.4.x] Chore: Upgrade Go to 1.20.10 (#76370) Chore: Upgrade Go to 1.20.10 (#76355) * [v10.1.x] Chore: Upgrade Go to 1.20.10 * Rebuild .drone.yml (cherry picked from commit 428768642092392c2da32a4bcee1b2e0a3f5ca6d) --- .drone.yml | 52 ++++++++++----------- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/pr-codeql-analysis-go.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- scripts/build/ci-build/Dockerfile | 2 +- scripts/drone/utils/images.star | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.drone.yml b/.drone.yml index 17e1c54c6eb..0e7c17bd8ec 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 . @@ -300,7 +300,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 @@ -384,7 +384,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" @@ -418,7 +418,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.8 + image: golang:1.20.10 name: lint-backend trigger: event: @@ -474,7 +474,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 @@ -861,7 +861,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 @@ -1036,7 +1036,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 @@ -1263,7 +1263,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 @@ -1340,7 +1340,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 @@ -1354,7 +1354,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.8 + image: golang:1.20.10 name: lint-backend - commands: - ./bin/build verify-drone @@ -1408,7 +1408,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 @@ -1851,7 +1851,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 @@ -2148,7 +2148,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 @@ -2244,7 +2244,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} @@ -2313,7 +2313,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 @@ -2378,7 +2378,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 @@ -2466,13 +2466,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: @@ -2574,7 +2574,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 @@ -2952,7 +2952,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} @@ -3259,7 +3259,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 @@ -3946,7 +3946,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 @@ -3973,7 +3973,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 @@ -4025,7 +4025,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 @@ -4240,6 +4240,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: ab65485c31598f6d4b184cbd50dcbbc409cf1666caaa4db46067881b95de9dfa +hmac: c225781553435807758920dc73d8121af350428f508844214c9f3da1eed70ab9 ... diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 74cd5d219fb..61002fae4f5 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@v3 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 f2110ce7ed5..e1a36e44591 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@v3 with: - go-version: '1.20.8' + go-version: '1.20.10' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/Dockerfile b/Dockerfile index f1189406aec..8c4621702e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE=alpine:3.18.3 ARG JS_IMAGE=node:18-alpine3.18 -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 2010a31333c..f062eb6594d 100644 --- a/Makefile +++ b/Makefile @@ -173,7 +173,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development. DOCKER_BUILDKIT=1 \ docker build \ --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:dev-ubuntu . ##@ Services diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index f1c544676fe..a504b12f1c2 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 d9f06e4f820..dee4eef652c 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",