diff --git a/.bingo/README.md b/.bingo/README.md index 1d8a1360ccf..7a5c2d4f6da 100644 --- a/.bingo/README.md +++ b/.bingo/README.md @@ -2,13 +2,13 @@ This is directory which stores Go modules with pinned buildable package that is used within this repository, managed by https://github.com/bwplotka/bingo. -- Run `bingo get` to install all tools having each own module file in this directory. -- Run `bingo get ` to install that have own module file in this directory. -- For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $() variable where is the .bingo/.mod. -- For shell: Run `source .bingo/variables.env` to source all environment variable for each tool. -- For go: Import `.bingo/variables.go` to for variable names. -- See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies. +* Run `bingo get` to install all tools having each own module file in this directory. +* Run `bingo get ` to install that have own module file in this directory. +* For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $() variable where is the .bingo/.mod. +* For shell: Run `source .bingo/variables.env` to source all environment variable for each tool. +* For go: Import `.bingo/variables.go` to for variable names. +* See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies. ## Requirements -- Go 1.14+ +* Go 1.14+ diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index 2c9eb124234..363c8b2cd30 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -1,13 +1,8 @@ -# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.8. DO NOT EDIT. +# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.9. DO NOT EDIT. # All tools are designed to be build inside $GOBIN. BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST))) GOPATH ?= $(shell go env GOPATH) -ifeq ($(OS),Windows_NT) - PATHSEP := $(if $(COMSPEC),;,:) - GOBIN ?= $(firstword $(subst $(PATHSEP), ,$(subst \,/,${GOPATH})))/bin -else - GOBIN ?= $(firstword $(subst :, ,${GOPATH}))/bin -endif +GOBIN ?= $(firstword $(subst :, ,${GOPATH}))/bin GO ?= $(shell which go) # Below generated variables ensure that every time a tool under each variable is invoked, the correct version @@ -64,9 +59,9 @@ $(SWAGGER): $(BINGO_DIR)/swagger.mod @echo "(re)installing $(GOBIN)/swagger-v0.30.2" @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=swagger.mod -o=$(GOBIN)/swagger-v0.30.2 "github.com/go-swagger/go-swagger/cmd/swagger" -WIRE := $(GOBIN)/wire-v0.5.0 +WIRE := $(GOBIN)/wire-v0.6.0 $(WIRE): $(BINGO_DIR)/wire.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/wire-v0.5.0" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=wire.mod -o=$(GOBIN)/wire-v0.5.0 "github.com/google/wire/cmd/wire" + @echo "(re)installing $(GOBIN)/wire-v0.6.0" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=wire.mod -o=$(GOBIN)/wire-v0.6.0 "github.com/google/wire/cmd/wire" diff --git a/.bingo/variables.env b/.bingo/variables.env index cf844231b92..dc64e5f430b 100644 --- a/.bingo/variables.env +++ b/.bingo/variables.env @@ -1,4 +1,4 @@ -# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.8. DO NOT EDIT. +# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.9. DO NOT EDIT. # All tools are designed to be build inside $GOBIN. # Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk. GOBIN=${GOBIN:=$(go env GOBIN)} @@ -22,5 +22,5 @@ LEFTHOOK="${GOBIN}/lefthook-v1.4.8" SWAGGER="${GOBIN}/swagger-v0.30.2" -WIRE="${GOBIN}/wire-v0.5.0" +WIRE="${GOBIN}/wire-v0.6.0" diff --git a/.drone.yml b/.drone.yml index f1e81e593a0..ef8715d70a5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -76,14 +76,14 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: test-backend-integration trigger: event: @@ -407,7 +407,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: validate-openapi-spec trigger: event: @@ -509,7 +509,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.22.5 --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.21.10 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ + --go-version=1.22.5 --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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-cue trigger: event: @@ -1134,7 +1134,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: swagger-gen trigger: event: @@ -1304,7 +1304,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: test-backend-integration trigger: branch: main @@ -1708,13 +1708,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -1789,7 +1789,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.22.5 --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.21.10 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ + --go-version=1.22.5 --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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-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.21.10-alpine + image: golang:1.22.5-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -2574,7 +2574,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -2691,7 +2691,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -2816,7 +2816,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -2904,7 +2904,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: compile-build-cmd - commands: - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python @@ -3129,7 +3129,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -3347,7 +3347,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.21.10 + GO_VERSION: 1.22.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3405,13 +3405,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: compile-build-cmd - commands: - ./bin/build whatsnew-checker depends_on: - compile-build-cmd - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: whats-new-checker trigger: event: @@ -3514,7 +3514,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3523,14 +3523,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -3538,7 +3538,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: test-backend - commands: - apk add --update build-base @@ -3547,7 +3547,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: test-backend-integration trigger: event: @@ -3604,7 +3604,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.21.10 + GO_VERSION: 1.22.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3787,7 +3787,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.21.10 + GO_VERSION: 1.22.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3937,7 +3937,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3946,14 +3946,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang @@ -3961,7 +3961,7 @@ steps: -timeout=5m depends_on: - wire-install - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: test-backend - commands: - apk add --update build-base @@ -3970,7 +3970,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: test-backend-integration trigger: cron: @@ -4025,7 +4025,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.21.10 + GO_VERSION: 1.22.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4172,7 +4172,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.21.10 + GO_VERSION: 1.22.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4281,7 +4281,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.21.10 + GO_VERSION: 1.22.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4371,20 +4371,20 @@ steps: - commands: [] depends_on: - clone - image: golang:1.21.10-windowsservercore-1809 + image: golang:1.22.5-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.21.10-windowsservercore-1809 + image: golang:1.22.5-windowsservercore-1809 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: golang:1.21.10-windowsservercore-1809 + image: golang:1.22.5-windowsservercore-1809 name: test-backend trigger: event: @@ -4477,7 +4477,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4486,14 +4486,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -4514,7 +4514,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -4535,7 +4535,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -4556,7 +4556,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -4572,7 +4572,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -4588,7 +4588,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -4604,7 +4604,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.21.10-alpine + image: golang:1.22.5-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -4959,7 +4959,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.21.10-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.22.5-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 @@ -4995,7 +4995,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.21.10-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.22.5-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 @@ -5250,6 +5250,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: b49df1dd4738902619ac6c78b56b6a6d125fb59f92e255fef37a78ea3cc15c4b +hmac: a83b9acab726c18c026a09dcf500db0ff6840ffd635d3baa0f08d0f1fcb5064a ... diff --git a/go.sum b/go.sum index a2b5dbbbf08..23b46ba0ca2 100644 --- a/go.sum +++ b/go.sum @@ -2484,8 +2484,6 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gotestyourself/gotestyourself v1.3.0/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= -github.com/grafana/alerting v0.0.0-20240213130827-92f64f0f2a12 h1:QepaY7wUP3U1hFiU1Lnv+tymnovzK21KQ/evMDpYsEw= -github.com/grafana/alerting v0.0.0-20240213130827-92f64f0f2a12/go.mod h1:brTFeACal/cSZAR8XO/4LPKs7rzNfS86okl6QjSP1eY= github.com/grafana/alerting v0.0.0-20240712183458-ce0d024b67ea h1:Ao9ZOl2coIN83rIfT4jfVauvwCQcsRwQPK4y68QJvRA= github.com/grafana/alerting v0.0.0-20240712183458-ce0d024b67ea/go.mod h1:brTFeACal/cSZAR8XO/4LPKs7rzNfS86okl6QjSP1eY= github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw= diff --git a/go.work b/go.work index dc71ce58478..c15c09cf921 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.21.10 +go 1.22.0 use ( . diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index a08f7126a1e..0becfd2ce91 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.21.10" +golang_version = "1.22.5" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "20.9.0"