Skip to content

Commit 4083d23

Browse files
authored
Chore: Bumping go to 1.21.6 (grafana#80709)
* Bumping go to 1.25.6 * bumping sqlite to 1.14.19 * Bumping sqlite version
1 parent 57609e1 commit 4083d23

13 files changed

+115
-116
lines changed

‎.drone.yml

+102-102
Large diffs are not rendered by default.

‎.github/workflows/alerting-swagger-gen.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set go version
1717
uses: actions/setup-go@v4
1818
with:
19-
go-version: '1.21.5'
19+
go-version: '1.21.6'
2020
- name: Build swagger
2121
run: |
2222
make -C pkg/services/ngalert/api/tooling post.json api.json

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
name: Set go version
4848
uses: actions/setup-go@v4
4949
with:
50-
go-version: '1.21.5'
50+
go-version: '1.21.6'
5151

5252
# Initializes the CodeQL tools for scanning.
5353
- name: Initialize CodeQL

‎.github/workflows/pr-codeql-analysis-go.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set go version
2727
uses: actions/setup-go@v4
2828
with:
29-
go-version: '1.21.5'
29+
go-version: '1.21.6'
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL

‎.github/workflows/publish-kinds-next.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: "Setup Go"
3737
uses: "actions/setup-go@v4"
3838
with:
39-
go-version: '1.21.5'
39+
go-version: '1.21.6'
4040

4141
- name: "Verify kinds"
4242
run: go run .github/workflows/scripts/kinds/verify-kinds.go

‎.github/workflows/publish-kinds-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: "Setup Go"
4040
uses: "actions/setup-go@v4"
4141
with:
42-
go-version: '1.21.5'
42+
go-version: '1.21.6'
4343

4444
- name: "Verify kinds"
4545
run: go run .github/workflows/scripts/kinds/verify-kinds.go

‎.github/workflows/verify-kinds.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: "Setup Go"
1919
uses: "actions/setup-go@v4"
2020
with:
21-
go-version: '1.21.5'
21+
go-version: '1.21.6'
2222

2323
- name: "Verify kinds"
2424
run: go run .github/workflows/scripts/kinds/verify-kinds.go

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG BASE_IMAGE=alpine:3.18.5
44
ARG JS_IMAGE=node:20-alpine3.18
55
ARG JS_PLATFORM=linux/amd64
6-
ARG GO_IMAGE=golang:1.21.5-alpine3.18
6+
ARG GO_IMAGE=golang:1.21.6-alpine3.18
77

88
ARG GO_SRC=go-builder
99
ARG JS_SRC=js-builder

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
261261
--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
262262
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
263263
--build-arg BASE_IMAGE=ubuntu:22.04 \
264-
--build-arg GO_IMAGE=golang:1.21.5 \
264+
--build-arg GO_IMAGE=golang:1.21.6 \
265265
--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
266266
$(DOCKER_BUILD_ARGS)
267267

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ require (
7878
github.com/m3db/prometheus_remote_client_golang v0.4.4 // @grafana/backend-platform
7979
github.com/magefile/mage v1.15.0 // @grafana/grafana-delivery
8080
github.com/mattn/go-isatty v0.0.18 // @grafana/backend-platform
81-
github.com/mattn/go-sqlite3 v1.14.16 // @grafana/backend-platform
81+
github.com/mattn/go-sqlite3 v1.14.19 // @grafana/backend-platform
8282
github.com/matttproud/golang_protobuf_extensions v1.0.4 // @grafana/alerting-squad-backend
8383
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // @grafana/grafana-operator-experience-squad
8484
github.com/opentracing/opentracing-go v1.2.0 // indirect

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -2283,8 +2283,8 @@ github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO
22832283
github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
22842284
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
22852285
github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
2286-
github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
2287-
github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
2286+
github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI=
2287+
github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
22882288
github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
22892289
github.com/mattn/goveralls v0.0.6 h1:cr8Y0VMo/MnEZBjxNN/vh6G90SZ7IMb6lms1dzMoO+Y=
22902290
github.com/mattn/goveralls v0.0.6/go.mod h1:h8b4ow6FxSPMQHF6o2ve3qsclnffZjYTNEKmLesRwqw=

‎scripts/drone/utils/images.star

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ load(
88
"nodejs_version",
99
)
1010

11-
# "go" image can be switched back to golang:{}-alpine once this is resolved https://github.com/mattn/go-sqlite3/pull/1177#issuecomment-1849176090
1211
images = {
1312
"git": "alpine/git:2.40.1",
14-
"go": "golang:{}-alpine3.18".format(golang_version),
13+
"go": "golang:{}-alpine".format(golang_version),
1514
"node": "node:{}-alpine".format(nodejs_version),
1615
"cloudsdk": "google/cloud-sdk:431.0.0",
1716
"publish": "grafana/grafana-ci-deploy:1.3.3",

‎scripts/drone/variables.star

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ global variables
33
"""
44

55
grabpl_version = "v3.0.47"
6-
golang_version = "1.21.5"
6+
golang_version = "1.21.6"
77

88
# nodejs_version should match what's in ".nvmrc", but without the v prefix.
99
nodejs_version = "20.9.0"

0 commit comments

Comments
 (0)