From 20c90ff60d020d9aafaa172675f406827606b7c5 Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Wed, 5 Jun 2024 14:29:27 -0400 Subject: [PATCH] Chore: bump Go to 1.22.4 (#88794) * chore: bump Go to 1.22.4 Signed-off-by: Dave Henderson * use go-version-file for ephemeral instances workflows too Signed-off-by: Dave Henderson --------- Signed-off-by: Dave Henderson --- .drone.yml | 210 +++++++++--------- .../ephemeral-instances-pr-comment.yml | 10 +- .../ephemeral-instances-pr-opened-closed.yml | 10 +- Dockerfile | 2 +- Makefile | 2 +- go.mod | 2 +- go.work | 2 +- scripts/drone/variables.star | 2 +- 8 files changed, 120 insertions(+), 120 deletions(-) diff --git a/.drone.yml b/.drone.yml index 17fae172cb1..1a81a72702e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -76,14 +76,14 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - go install github.com/bazelbuild/buildtools/buildifier@latest - buildifier --lint=warn -mode=check -r . depends_on: - compile-build-cmd - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: lint-starlark trigger: event: @@ -319,7 +319,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -328,14 +328,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -343,7 +343,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: test-backend - commands: - apk add --update build-base @@ -352,7 +352,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: test-backend-integration trigger: event: @@ -404,7 +404,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - apk add --update curl jq bash @@ -431,7 +431,7 @@ steps: - apk add --update make - make gen-go depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - apk add --update make build-base @@ -440,16 +440,16 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: validate-openapi-spec trigger: event: @@ -508,7 +508,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -518,7 +518,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -527,14 +527,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - yarn install --immutable || yarn install --immutable @@ -567,7 +567,7 @@ steps: from_secret: drone_token - commands: - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - -a targz:grafana:linux/arm/v7 --go-version=1.22.3 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.22.4 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - yarn-install @@ -771,7 +771,7 @@ steps: - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER - --go-version=1.22.3 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ + --go-version=1.22.4 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i @@ -915,7 +915,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -929,7 +929,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -938,14 +938,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -966,7 +966,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -987,7 +987,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -1008,7 +1008,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -1024,7 +1024,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1040,7 +1040,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -1056,7 +1056,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1144,7 +1144,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue trigger: event: @@ -1185,7 +1185,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - apt-get update -yq && apt-get install shellcheck @@ -1257,7 +1257,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: swagger-gen trigger: event: @@ -1353,7 +1353,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1364,7 +1364,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1374,14 +1374,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - apk add --update build-base @@ -1389,7 +1389,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1401,7 +1401,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1412,7 +1412,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: mysql-5.7-benchmark-integration-tests - commands: - apk add --update build-base @@ -1423,7 +1423,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1501,7 +1501,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue trigger: branch: main @@ -1674,7 +1674,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1683,14 +1683,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -1698,7 +1698,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: test-backend - commands: - apk add --update build-base @@ -1707,7 +1707,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: test-backend-integration trigger: branch: main @@ -1752,13 +1752,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - apk add --update make build-base @@ -1767,16 +1767,16 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -1833,7 +1833,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1843,7 +1843,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1852,14 +1852,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - yarn install --immutable || yarn install --immutable @@ -1891,7 +1891,7 @@ steps: name: build-frontend-packages - commands: - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - -a targz:grafana:linux/arm/v7 --go-version=1.22.3 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.22.4 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - update-package-json-version @@ -2131,7 +2131,7 @@ steps: - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER - --go-version=1.22.3 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ + --go-version=1.22.4 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i @@ -2337,7 +2337,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2351,7 +2351,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2360,14 +2360,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2388,7 +2388,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -2409,7 +2409,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2430,7 +2430,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2446,7 +2446,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2462,7 +2462,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2478,7 +2478,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -2671,7 +2671,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -2768,7 +2768,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -2838,7 +2838,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - yarn install --immutable || yarn install --immutable @@ -2904,7 +2904,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -3011,7 +3011,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.3 + GO_VERSION: 1.22.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3069,13 +3069,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: compile-build-cmd - commands: - ./bin/build whatsnew-checker depends_on: - compile-build-cmd - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: whats-new-checker trigger: event: @@ -3177,7 +3177,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3186,14 +3186,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -3201,7 +3201,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: test-backend - commands: - apk add --update build-base @@ -3210,7 +3210,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: test-backend-integration trigger: event: @@ -3267,7 +3267,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.3 + GO_VERSION: 1.22.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3450,7 +3450,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.3 + GO_VERSION: 1.22.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3599,7 +3599,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3608,14 +3608,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -3623,7 +3623,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: test-backend - commands: - apk add --update build-base @@ -3632,7 +3632,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: test-backend-integration trigger: cron: @@ -3687,7 +3687,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.3 + GO_VERSION: 1.22.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3834,7 +3834,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.3 + GO_VERSION: 1.22.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3923,7 +3923,7 @@ steps: - commands: - 'dagger run --silent /src/grafana-build artifacts -a $${ARTIFACTS} --grafana-ref=$${GRAFANA_REF} --enterprise-ref=$${ENTERPRISE_REF} --grafana-repo=$${GRAFANA_REPO} --version=$${VERSION} ' - - --go-version=1.22.3 + - --go-version=1.22.4 environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token @@ -3944,7 +3944,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.3 + GO_VERSION: 1.22.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4034,20 +4034,20 @@ steps: - commands: [] depends_on: - clone - image: golang:1.22.3-windowsservercore-1809 + image: golang:1.22.4-windowsservercore-1809 name: windows-init - commands: - go install github.com/google/wire/cmd/wire@v0.5.0 - wire gen -tags oss ./pkg/server depends_on: - windows-init - image: golang:1.22.3-windowsservercore-1809 + image: golang:1.22.4-windowsservercore-1809 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: golang:1.22.3-windowsservercore-1809 + image: golang:1.22.4-windowsservercore-1809 name: test-backend trigger: event: @@ -4140,7 +4140,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4149,14 +4149,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -4177,7 +4177,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -4198,7 +4198,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -4219,7 +4219,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -4235,7 +4235,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -4251,7 +4251,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -4267,7 +4267,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.22.3-alpine + image: golang:1.22.4-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -4621,7 +4621,7 @@ steps: path: /root/.docker/ - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.22.3-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.22.4-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 @@ -4656,7 +4656,7 @@ steps: path: /root/.docker/ - commands: - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.22.3-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.22.4-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 @@ -4911,6 +4911,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 08b57187429b046e3d98cbb010ce0b632b678e9b6964beb11005e22184e0232c +hmac: 7d2348a3bc09c44b08dda2d737f91c7de3e5048aa47ba65eada4cdde1eea9fa6 ... diff --git a/.github/workflows/ephemeral-instances-pr-comment.yml b/.github/workflows/ephemeral-instances-pr-comment.yml index 22175d820d0..0d2a296261e 100644 --- a/.github/workflows/ephemeral-instances-pr-comment.yml +++ b/.github/workflows/ephemeral-instances-pr-comment.yml @@ -37,11 +37,6 @@ jobs: labels: ubuntu-latest-8-cores continue-on-error: true steps: - - name: Setup Go - uses: actions/setup-go@v4 - with: - go-version: '>=1.22.3' - - name: Generate a GitHub app installation token id: generate_token uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 @@ -57,6 +52,11 @@ jobs: ref: main path: ephemeral + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version-file: ephemeral/go.mod + - name: Get latest grafana version number run: | # if package.json contains e.g. 11.0.0-pre, this writes 11.0.0 to version.txt diff --git a/.github/workflows/ephemeral-instances-pr-opened-closed.yml b/.github/workflows/ephemeral-instances-pr-opened-closed.yml index 96c67156f9c..03e951f4725 100644 --- a/.github/workflows/ephemeral-instances-pr-opened-closed.yml +++ b/.github/workflows/ephemeral-instances-pr-opened-closed.yml @@ -29,11 +29,6 @@ jobs: runs-on: ubuntu-latest continue-on-error: true steps: - - name: Setup Go - uses: actions/setup-go@v4 - with: - go-version: '>=1.22.3' - - name: Generate a GitHub app installation token id: generate_token uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 @@ -49,6 +44,11 @@ jobs: ref: main path: ephemeral + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version-file: ephemeral/go.mod + - name: Get latest grafana version number run: | # if package.json contains e.g. 11.0.0-pre, this writes 11.0.0 to version.txt diff --git a/Dockerfile b/Dockerfile index 25c51ea019a..37d5609de7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=alpine:3.19.1 ARG JS_IMAGE=node:20-alpine ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.22.3-alpine +ARG GO_IMAGE=golang:1.22.4-alpine ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/Makefile b/Makefile index 85dbdb5c3f2..88ea3718b4c 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ include .bingo/Variables.mk GO = go -GO_VERSION = 1.22.3 +GO_VERSION = 1.22.4 GO_FILES ?= ./pkg/... ./pkg/apiserver/... ./pkg/apimachinery/... ./pkg/promlib/... SH_FILES ?= $(shell find ./scripts -name *.sh) GO_RACE := $(shell [ -n "$(GO_RACE)" -o -e ".go-race-enabled-locally" ] && echo 1 ) diff --git a/go.mod b/go.mod index 65a93886a5d..1dbb721e5b3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.22.3 +go 1.22.4 // Override docker/docker to avoid: // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires diff --git a/go.work b/go.work index 376711f2739..52ee802a47f 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.22.3 +go 1.22.4 use ( . diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index 395289837c4..b6559555890 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -3,7 +3,7 @@ global variables """ grabpl_version = "v3.0.50" -golang_version = "1.22.3" +golang_version = "1.22.4" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "20.9.0"