From b3220a05aa47cf7c75deebbc1c156cef57a8389b Mon Sep 17 00:00:00 2001 From: Andreas Christou Date: Fri, 1 Mar 2024 13:39:12 +0000 Subject: [PATCH] [v10.0.x] Chore: Bumping go to 1.21.6 (#83727) Chore: Bumping go to 1.21.6 (#80709) * Bumping go to 1.25.6 * bumping sqlite to 1.14.19 * Bumping sqlite version (cherry picked from commit 4083d23f017d5118f80d478d16d52fb65a48b462) # Conflicts: # .drone.yml # .github/workflows/alerting-swagger-gen.yml # .github/workflows/publish-kinds-next.yml # .github/workflows/publish-kinds-release.yml # .github/workflows/verify-kinds.yml # go.mod # go.sum # scripts/drone/variables.star Co-authored-by: Timur Olzhabayev --- .drone.yml | 194 ++++++++++---------- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/pr-codeql-analysis-go.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- go.mod | 2 +- go.sum | 2 + scripts/drone/utils/images.star | 3 +- scripts/drone/variables.star | 2 +- 9 files changed, 106 insertions(+), 105 deletions(-) diff --git a/.drone.yml b/.drone.yml index ebc31d51771..f8437cef802 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-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.5-alpine3.18 + image: golang:1.21.6-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.5-alpine3.18 + image: golang:1.21.6-alpine name: lint-starlark trigger: event: @@ -306,7 +306,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -315,21 +315,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: test-backend - commands: - apk add --update build-base @@ -338,7 +338,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: test-backend-integration trigger: event: @@ -389,7 +389,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - apk add --update curl jq bash @@ -416,7 +416,7 @@ steps: - apk add --update make - make gen-go depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - apk add --update make build-base @@ -425,7 +425,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: lint-backend trigger: event: @@ -482,7 +482,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -492,7 +492,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -501,14 +501,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - yarn install --immutable @@ -541,7 +541,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.5 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.21.6 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - yarn-install @@ -827,7 +827,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -841,7 +841,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -850,14 +850,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -878,7 +878,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -899,7 +899,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -920,7 +920,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -935,7 +935,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -950,7 +950,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -967,7 +967,7 @@ steps: AM_PASSWORD: test AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1055,7 +1055,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue trigger: event: @@ -1096,7 +1096,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - apt-get update -yq && apt-get install shellcheck @@ -1204,7 +1204,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1215,7 +1215,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1225,14 +1225,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - apk add --update build-base @@ -1240,7 +1240,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1252,7 +1252,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1263,7 +1263,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: mysql-5.7-benchmark-integration-tests - commands: - apk add --update build-base @@ -1274,7 +1274,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1352,7 +1352,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue trigger: branch: main @@ -1512,7 +1512,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1521,21 +1521,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: test-backend - commands: - apk add --update build-base @@ -1544,7 +1544,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: test-backend-integration trigger: branch: main @@ -1589,13 +1589,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - apk add --update make build-base @@ -1604,7 +1604,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: lint-backend - commands: - ./bin/build verify-drone @@ -1661,7 +1661,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1671,7 +1671,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1680,14 +1680,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - yarn install --immutable @@ -1719,7 +1719,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.5 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.21.6 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - update-package-json-version @@ -2103,7 +2103,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2117,7 +2117,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2126,14 +2126,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2154,7 +2154,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -2175,7 +2175,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2196,7 +2196,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2211,7 +2211,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2226,7 +2226,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2243,7 +2243,7 @@ steps: AM_PASSWORD: test AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -2436,7 +2436,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -2533,7 +2533,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -2603,7 +2603,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - yarn install --immutable @@ -2632,7 +2632,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: release-npm-packages trigger: event: @@ -2669,7 +2669,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -2776,7 +2776,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.21.5 + GO_VERSION: 1.21.6 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -2834,13 +2834,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: compile-build-cmd - commands: - ./bin/build whatsnew-checker depends_on: - compile-build-cmd - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: whats-new-checker trigger: event: @@ -2942,7 +2942,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2951,21 +2951,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: test-backend - commands: - apk add --update build-base @@ -2974,7 +2974,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: test-backend-integration trigger: event: @@ -3031,7 +3031,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.21.5 + GO_VERSION: 1.21.6 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3214,7 +3214,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.21.5 + GO_VERSION: 1.21.6 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3363,7 +3363,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3372,21 +3372,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: test-backend - commands: - apk add --update build-base @@ -3395,7 +3395,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: test-backend-integration trigger: cron: @@ -3450,7 +3450,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.21.5 + GO_VERSION: 1.21.6 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3597,7 +3597,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.21.5 + GO_VERSION: 1.21.6 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -3695,20 +3695,20 @@ steps: - commands: [] depends_on: - clone - image: golang:1.21.5-windowsservercore-1809 + image: golang:1.21.6-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.5-windowsservercore-1809 + image: golang:1.21.6-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.5-windowsservercore-1809 + image: golang:1.21.6-windowsservercore-1809 name: test-backend trigger: event: @@ -3801,7 +3801,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3810,14 +3810,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -3838,7 +3838,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -3859,7 +3859,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -3880,7 +3880,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -3895,7 +3895,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3910,7 +3910,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -3927,7 +3927,7 @@ steps: AM_PASSWORD: test AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.21.5-alpine3.18 + image: golang:1.21.6-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -4281,7 +4281,7 @@ steps: path: /root/.docker/ - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.5-alpine3.18 + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.6-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:18.12.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 @@ -4315,7 +4315,7 @@ steps: path: /root/.docker/ - commands: - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.5-alpine3.18 + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.6-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:18.12.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 @@ -4569,6 +4569,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 1ab9b7a686a08f6adc1c15c35a76ee5bed8a6d232cb45777d31141683b2b44f9 +hmac: 6b4d81707e2e35e64d565d66287b6f46c2311e544664669fdc284a381683fac8 ... diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8aa31dfc54d..937750e70b6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: name: Set go version uses: actions/setup-go@v3 with: - go-version: '1.21.5' + go-version: '1.21.6' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/pr-codeql-analysis-go.yml b/.github/workflows/pr-codeql-analysis-go.yml index 7b123a17077..c9e14b03d8c 100644 --- a/.github/workflows/pr-codeql-analysis-go.yml +++ b/.github/workflows/pr-codeql-analysis-go.yml @@ -23,7 +23,7 @@ jobs: - name: Set go version uses: actions/setup-go@v3 with: - go-version: '1.21.5' + go-version: '1.21.6' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/Dockerfile b/Dockerfile index d909576f712..e00ade8a79b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=alpine:3.18.3 ARG JS_IMAGE=node:18-alpine3.18 ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.21.5-alpine3.18 +ARG GO_IMAGE=golang:1.21.6-alpine3.18 ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/Makefile b/Makefile index 066cbee5967..4d09a2b0379 100644 --- a/Makefile +++ b/Makefile @@ -245,7 +245,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development. --build-arg COMMIT_SHA=$$(git rev-parse HEAD) \ --build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \ --build-arg BASE_IMAGE=ubuntu:22.04 \ - --build-arg GO_IMAGE=golang:1.21.5 \ + --build-arg GO_IMAGE=golang:1.21.6 \ --tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \ $(DOCKER_BUILD_ARGS) diff --git a/go.mod b/go.mod index fce9ded82e2..e7550e767fd 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( github.com/m3db/prometheus_remote_client_golang v0.4.4 github.com/magefile/mage v1.14.0 github.com/mattn/go-isatty v0.0.18 - github.com/mattn/go-sqlite3 v1.14.16 + github.com/mattn/go-sqlite3 v1.14.19 github.com/matttproud/golang_protobuf_extensions v1.0.4 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f github.com/opentracing/opentracing-go v1.2.0 // indirect diff --git a/go.sum b/go.sum index 1cb3f37fe1b..3fcc76f3c68 100644 --- a/go.sum +++ b/go.sum @@ -1749,6 +1749,8 @@ github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= +github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= diff --git a/scripts/drone/utils/images.star b/scripts/drone/utils/images.star index 32b883dde98..d018d637b63 100644 --- a/scripts/drone/utils/images.star +++ b/scripts/drone/utils/images.star @@ -8,10 +8,9 @@ load( "nodejs_version", ) -# "go" image can be switched back to golang:{}-alpine once this is resolved https://github.com/mattn/go-sqlite3/pull/1177#issuecomment-1849176090 images = { "git": "alpine/git:2.40.1", - "go": "golang:{}-alpine3.18".format(golang_version), + "go": "golang:{}-alpine".format(golang_version), "node": "node:{}-alpine".format(nodejs_version), "cloudsdk": "google/cloud-sdk:431.0.0", "publish": "grafana/grafana-ci-deploy:1.3.3", diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index 3a9f4bc1eb2..e5e01e4d89c 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.5" +golang_version = "1.21.6" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "18.12.0"