From 64485061ba4fbf43a1101ab4ac73ffb14a08143a Mon Sep 17 00:00:00 2001 From: Horst Gutmann Date: Wed, 11 Oct 2023 16:45:57 +0200 Subject: [PATCH] [v10.0.x] Chore: Upgrade Go to 1.20.10 (#76365) 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 e4b33fd0f8e..33ea9ebb8e2 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 @@ -386,7 +386,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" @@ -420,7 +420,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.8 + image: golang:1.20.10 name: lint-backend trigger: event: @@ -476,7 +476,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 @@ -871,7 +871,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 @@ -1060,7 +1060,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 @@ -1279,7 +1279,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 @@ -1358,7 +1358,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 @@ -1372,7 +1372,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 @@ -1426,7 +1426,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 @@ -1880,7 +1880,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 @@ -2199,7 +2199,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 @@ -2295,7 +2295,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} @@ -2364,7 +2364,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 @@ -2429,7 +2429,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 @@ -2517,13 +2517,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: @@ -2625,7 +2625,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 @@ -3005,7 +3005,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} @@ -3314,7 +3314,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 @@ -4059,7 +4059,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 @@ -4086,7 +4086,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 @@ -4138,7 +4138,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 @@ -4341,6 +4341,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 2e8b7d89c34e92802b0bb4b8eaf3625b082986ac2bcee39e54a3bfb52271f3e0 +hmac: 4f9de3e9ea36382ed000e362922344465ce0ee049650391e8cc8ef68b988d351 ... 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 d2a8abea778..3d7508beae9 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 8bf9419c7e2..83140ce0eef 100644 --- a/Makefile +++ b/Makefile @@ -207,7 +207,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 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 73f12bd0b9a..b621583366a 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",