diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod index c649e6549b6..9e5d2318f23 100644 --- a/.bingo/golangci-lint.mod +++ b/.bingo/golangci-lint.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.24.2 +go 1.24.3 require github.com/golangci/golangci-lint v1.64.2 // cmd/golangci-lint diff --git a/.drone.yml b/.drone.yml index 54a5ab7af50..698ef38cebb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -75,7 +75,7 @@ steps: - go install github.com/bazelbuild/buildtools/buildifier@latest - buildifier --lint=warn -mode=check -r . depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: lint-starlark trigger: event: @@ -370,7 +370,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -379,14 +379,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -394,7 +394,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend - commands: - apk add --update build-base @@ -403,7 +403,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend-integration trigger: event: @@ -456,7 +456,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - echo $(/usr/bin/github-app-external-token) > /github-app/token @@ -500,7 +500,7 @@ steps: - apk add --update make - make gen-go depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update make build-base @@ -509,16 +509,16 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-openapi-spec trigger: event: @@ -591,7 +591,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -601,7 +601,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -610,14 +610,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python @@ -654,7 +654,7 @@ steps: - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*' - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - -a targz:grafana:linux/arm/v7 --go-version=1.24.2 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.24.3 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - yarn-install @@ -812,7 +812,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.24.2 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --tag-format='{{ + --go-version=1.24.3 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --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 @@ -973,7 +973,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -987,7 +987,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -996,14 +996,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -1024,7 +1024,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -1045,7 +1045,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -1066,7 +1066,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -1082,7 +1082,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1098,7 +1098,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -1114,7 +1114,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1200,7 +1200,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue trigger: event: @@ -1320,7 +1320,7 @@ steps: && return 1; fi depends_on: - clone-enterprise - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: swagger-gen trigger: event: @@ -1441,7 +1441,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1452,7 +1452,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1462,14 +1462,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update build-base @@ -1477,7 +1477,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1489,7 +1489,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1500,7 +1500,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-benchmark-integration-tests - commands: - apk add --update build-base @@ -1511,7 +1511,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1587,7 +1587,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue trigger: branch: main @@ -1764,7 +1764,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1773,14 +1773,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -1788,7 +1788,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend - commands: - apk add --update build-base @@ -1797,7 +1797,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend-integration trigger: branch: main @@ -1842,13 +1842,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update make build-base @@ -1857,16 +1857,16 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -1937,7 +1937,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1947,7 +1947,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1956,14 +1956,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python @@ -1999,7 +1999,7 @@ steps: - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*' - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - -a targz:grafana:linux/arm/v7 --go-version=1.24.2 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.24.3 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - update-package-json-version @@ -2193,7 +2193,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.24.2 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --tag-format='{{ + --go-version=1.24.3 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --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 @@ -2397,7 +2397,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2411,7 +2411,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2420,14 +2420,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2448,7 +2448,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -2469,7 +2469,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2490,7 +2490,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2506,7 +2506,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2522,7 +2522,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2538,7 +2538,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -2683,7 +2683,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -2813,7 +2813,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -2954,7 +2954,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket @@ -3045,7 +3045,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python @@ -3146,7 +3146,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -3262,7 +3262,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3337,7 +3337,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3454,7 +3454,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3606,7 +3606,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3615,14 +3615,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -3630,7 +3630,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend - commands: - apk add --update build-base @@ -3639,7 +3639,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend-integration trigger: cron: @@ -3693,7 +3693,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3837,7 +3837,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3963,7 +3963,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4108,7 +4108,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4117,14 +4117,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -4145,7 +4145,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -4166,7 +4166,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -4187,7 +4187,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -4203,7 +4203,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -4219,7 +4219,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -4235,7 +4235,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -4541,7 +4541,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.24.2-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.3-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 @@ -4579,7 +4579,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.24.2-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.3-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 @@ -4836,6 +4836,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 77cf486cba59cee56db9edbbfeee4997cd22bc9060dd854639e2ae44822dc080 +hmac: 32b2d73ca79e646baefb9b8a6a408e125664297e402ba207c6fc0a7c78d49a1b ... diff --git a/Dockerfile b/Dockerfile index 41a2a17132c..f4bab794c6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG BASE_IMAGE=alpine:3.21 ARG JS_IMAGE=node:20-alpine ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.24.2-alpine +ARG GO_IMAGE=golang:1.24.3-alpine # Default to building locally ARG GO_SRC=go-builder diff --git a/go.mod b/go.mod index 63e63ecaa1f..aa97b9ea2d8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.24.2 +go 1.24.3 // 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 fcace728487..29bfcb15ba8 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.24.2 +go 1.24.3 use ( . diff --git a/pkg/build/go.mod b/pkg/build/go.mod index 3114dd21fc0..12508ebe060 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.24.2 +go 1.24.3 // Override docker/docker to avoid: // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires diff --git a/pkg/util/xorm/go.mod b/pkg/util/xorm/go.mod index c328d841c05..eadddce548c 100644 --- a/pkg/util/xorm/go.mod +++ b/pkg/util/xorm/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/util/xorm -go 1.24.2 +go 1.24.3 require ( github.com/mattn/go-sqlite3 v1.14.19 diff --git a/scripts/build/ci-windows-test/Dockerfile b/scripts/build/ci-windows-test/Dockerfile index f5573d1cb9f..41d18ffc62c 100644 --- a/scripts/build/ci-windows-test/Dockerfile +++ b/scripts/build/ci-windows-test/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.2-windowsservercore-1809 +FROM golang:1.24.3-windowsservercore-1809 SHELL ["powershell", "-command"] diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index 54b76ba1804..511223cc91e 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -3,7 +3,7 @@ global variables """ grabpl_version = "v3.1.2" -golang_version = "1.24.2" +golang_version = "1.24.3" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "20.9.0" diff --git a/scripts/modowners/go.mod b/scripts/modowners/go.mod index e0963d9a06a..b6401606139 100644 --- a/scripts/modowners/go.mod +++ b/scripts/modowners/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/modowners -go 1.24.2 +go 1.24.3 require golang.org/x/mod v0.17.0