diff --git a/.drone.yml b/.drone.yml index fbdda66708f..3e8d207fb5e 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: @@ -323,7 +323,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.' @@ -332,14 +332,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 @@ -347,7 +347,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 @@ -356,7 +356,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: @@ -407,7 +407,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 @@ -434,7 +434,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 @@ -443,16 +443,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: @@ -509,7 +509,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 @@ -519,7 +519,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.' @@ -528,14 +528,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 g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python @@ -569,7 +569,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 @@ -719,7 +719,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 @@ -863,7 +863,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 @@ -877,7 +877,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.' @@ -886,14 +886,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 @@ -914,7 +914,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 @@ -935,7 +935,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 @@ -956,7 +956,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 @@ -972,7 +972,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 @@ -988,7 +988,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 @@ -1004,7 +1004,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: @@ -1093,7 +1093,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: @@ -1134,7 +1134,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 @@ -1202,7 +1202,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: @@ -1304,7 +1304,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 @@ -1315,7 +1315,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.' @@ -1325,14 +1325,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 @@ -1340,7 +1340,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 @@ -1352,7 +1352,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 @@ -1363,7 +1363,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 @@ -1374,7 +1374,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: @@ -1453,7 +1453,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 @@ -1630,7 +1630,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.' @@ -1639,14 +1639,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 @@ -1654,7 +1654,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 @@ -1663,7 +1663,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 @@ -1708,13 +1708,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 @@ -1723,16 +1723,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 @@ -1789,7 +1789,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 @@ -1799,7 +1799,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.' @@ -1808,14 +1808,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 g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python @@ -1848,7 +1848,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 @@ -2034,7 +2034,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 @@ -2240,7 +2240,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 @@ -2254,7 +2254,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.' @@ -2263,14 +2263,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 @@ -2291,7 +2291,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 @@ -2312,7 +2312,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 @@ -2333,7 +2333,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 @@ -2349,7 +2349,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 @@ -2365,7 +2365,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 @@ -2381,7 +2381,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 @@ -2574,7 +2574,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 @@ -2705,7 +2705,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 @@ -2841,7 +2841,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} @@ -2926,7 +2926,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 g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python @@ -3151,7 +3151,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 @@ -3369,7 +3369,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: @@ -3427,13 +3427,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: @@ -3536,7 +3536,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.' @@ -3545,14 +3545,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 @@ -3560,7 +3560,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 @@ -3569,7 +3569,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: @@ -3626,7 +3626,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: @@ -3809,7 +3809,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: @@ -3959,7 +3959,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.' @@ -3968,14 +3968,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 @@ -3983,7 +3983,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 @@ -3992,7 +3992,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: @@ -4047,7 +4047,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: @@ -4194,7 +4194,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: @@ -4303,7 +4303,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: @@ -4393,20 +4393,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: @@ -4499,7 +4499,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.' @@ -4508,14 +4508,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 @@ -4536,7 +4536,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 @@ -4557,7 +4557,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 @@ -4578,7 +4578,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 @@ -4594,7 +4594,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 @@ -4610,7 +4610,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 @@ -4626,7 +4626,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: @@ -4981,7 +4981,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 @@ -5017,7 +5017,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 @@ -5272,6 +5272,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 2e36c1fe2dec54df906c75f12309bef889e60435b53df6f4e0189370c67b0032 +hmac: f6a676420bf68d50345dff672d628c40a9efab0f2d3d6a682f3295b63dba5673 ... diff --git a/Dockerfile b/Dockerfile index 97488ad51dd..48a752074de 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 fd68b87dc3d..f633f210e3c 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 df5e1636932..d41268742f3 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.22.5 +go 1.22.7 use ( . diff --git a/pkg/build/go.mod b/pkg/build/go.mod index 4fcfaa13436..e37fce973e5 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.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"