From 7d07fe5fdcf2beee40db9b1530dbdc6afb66b9f8 Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Tue, 17 Sep 2024 16:59:08 -0400 Subject: [PATCH] [v10.3.x] Chore: Bump Go to 1.22.7 (#93360) Signed-off-by: Dave Henderson --- .drone.yml | 208 +++++++++++++++++------------------ Dockerfile | 2 +- apps/.gitkeep | 1 + go.mod | 2 +- go.work | 2 +- pkg/build/go.mod | 4 +- scripts/drone/variables.star | 2 +- 7 files changed, 110 insertions(+), 111 deletions(-) create mode 100644 apps/.gitkeep diff --git a/.drone.yml b/.drone.yml index d4e7da57952..3a81361bd5c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-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.5-alpine + image: golang:1.22.7-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.5-alpine + image: golang:1.22.7-alpine name: lint-starlark trigger: event: @@ -321,7 +321,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -330,14 +330,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -345,7 +345,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: test-backend - commands: - apk add --update build-base @@ -354,7 +354,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: test-backend-integration trigger: event: @@ -405,7 +405,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - apk add --update curl jq bash @@ -432,7 +432,7 @@ steps: - apk add --update make - make gen-go depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - apk add --update make build-base @@ -441,16 +441,16 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: validate-openapi-spec trigger: event: @@ -507,7 +507,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -517,7 +517,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -526,14 +526,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - yarn install --immutable @@ -566,7 +566,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.5 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.22.7 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - yarn-install @@ -711,7 +711,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.5 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ + --go-version=1.22.7 --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 @@ -852,7 +852,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -866,7 +866,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -875,14 +875,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -903,7 +903,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -924,7 +924,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -945,7 +945,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -961,7 +961,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -977,7 +977,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -993,7 +993,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1081,7 +1081,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue trigger: event: @@ -1122,7 +1122,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - apt-get update -yq && apt-get install shellcheck @@ -1190,7 +1190,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: swagger-gen trigger: event: @@ -1292,7 +1292,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1303,7 +1303,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1313,14 +1313,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - apk add --update build-base @@ -1328,7 +1328,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1340,7 +1340,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1351,7 +1351,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: mysql-5.7-benchmark-integration-tests - commands: - apk add --update build-base @@ -1362,7 +1362,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1440,7 +1440,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue trigger: branch: main @@ -1615,7 +1615,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1624,14 +1624,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -1639,7 +1639,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: test-backend - commands: - apk add --update build-base @@ -1648,7 +1648,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: test-backend-integration trigger: branch: main @@ -1693,13 +1693,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - apk add --update make build-base @@ -1708,16 +1708,16 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -1774,7 +1774,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1784,7 +1784,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1793,14 +1793,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - yarn install --immutable @@ -1832,7 +1832,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.5 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.22.7 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - update-package-json-version @@ -2013,7 +2013,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.5 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ + --go-version=1.22.7 --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 @@ -2216,7 +2216,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2230,7 +2230,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2239,14 +2239,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2267,7 +2267,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -2288,7 +2288,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2309,7 +2309,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2325,7 +2325,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2341,7 +2341,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2357,7 +2357,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -2550,7 +2550,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -2681,7 +2681,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -2817,7 +2817,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -2902,7 +2902,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - yarn install --immutable @@ -3126,7 +3126,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -3344,7 +3344,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.5 + GO_VERSION: 1.22.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3402,13 +3402,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - ./bin/build whatsnew-checker depends_on: - compile-build-cmd - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: whats-new-checker trigger: event: @@ -3510,7 +3510,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3519,14 +3519,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -3534,7 +3534,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: test-backend - commands: - apk add --update build-base @@ -3543,7 +3543,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: test-backend-integration trigger: event: @@ -3600,7 +3600,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.5 + GO_VERSION: 1.22.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3783,7 +3783,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.5 + GO_VERSION: 1.22.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3932,7 +3932,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3941,14 +3941,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -3956,7 +3956,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: test-backend - commands: - apk add --update build-base @@ -3965,7 +3965,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: test-backend-integration trigger: cron: @@ -4020,7 +4020,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.5 + GO_VERSION: 1.22.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4167,7 +4167,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.5 + GO_VERSION: 1.22.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4265,20 +4265,20 @@ steps: - commands: [] depends_on: - clone - image: golang:1.22.5-windowsservercore-1809 + image: golang:1.22.7-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.5-windowsservercore-1809 + image: golang:1.22.7-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.5-windowsservercore-1809 + image: golang:1.22.7-windowsservercore-1809 name: test-backend trigger: event: @@ -4371,7 +4371,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4380,14 +4380,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -4408,7 +4408,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -4429,7 +4429,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -4450,7 +4450,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -4466,7 +4466,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -4482,7 +4482,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -4498,7 +4498,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.22.5-alpine + image: golang:1.22.7-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -4853,7 +4853,7 @@ steps: - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM docker:27-cli - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.22.5-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.22.7-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3 @@ -4889,7 +4889,7 @@ steps: - commands: - trivy --exit-code 1 --severity HIGH,CRITICAL docker:27-cli - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.22.5-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.22.7-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3 @@ -5144,6 +5144,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 3e26db39eb0870ff10cc59dcc9ca90e19edd7062234b14acbfc61526d0cf6267 +hmac: af4cb0ce0d334357f5cfc509befcadc0a5111a8b04831f09538f8f62b9caadb5 ... diff --git a/Dockerfile b/Dockerfile index 453230c9d3c..a23a23fa2d5 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.21.10-alpine +ARG GO_IMAGE=golang:1.22.7-alpine ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/apps/.gitkeep b/apps/.gitkeep new file mode 100644 index 00000000000..d5e8e8f26a0 --- /dev/null +++ b/apps/.gitkeep @@ -0,0 +1 @@ +# workaround for grafana-build quirk diff --git a/go.mod b/go.mod index ca6959c768c..30fe111ccc0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.22.0 +go 1.22.7 // 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 c15c09cf921..d41268742f3 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.22.0 +go 1.22.7 use ( . diff --git a/pkg/build/go.mod b/pkg/build/go.mod index b0fb510f67a..ac972242311 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,8 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.22 - -toolchain go1.22.5 +go 1.22.7 // Override docker/docker to avoid: // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index 0becfd2ce91..d8db5988678 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.5" +golang_version = "1.22.7" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "20.9.0"