Skip to content

Commit 20c90ff

Browse files
Chore: bump Go to 1.22.4 (grafana#88794)
* chore: bump Go to 1.22.4 Signed-off-by: Dave Henderson <[email protected]> * use go-version-file for ephemeral instances workflows too Signed-off-by: Dave Henderson <[email protected]> --------- Signed-off-by: Dave Henderson <[email protected]>
1 parent 1059441 commit 20c90ff

File tree

8 files changed

+120
-120
lines changed

8 files changed

+120
-120
lines changed

.drone.yml

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

.github/workflows/ephemeral-instances-pr-comment.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ jobs:
3737
labels: ubuntu-latest-8-cores
3838
continue-on-error: true
3939
steps:
40-
- name: Setup Go
41-
uses: actions/setup-go@v4
42-
with:
43-
go-version: '>=1.22.3'
44-
4540
- name: Generate a GitHub app installation token
4641
id: generate_token
4742
uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
@@ -57,6 +52,11 @@ jobs:
5752
ref: main
5853
path: ephemeral
5954

55+
- name: Setup Go
56+
uses: actions/setup-go@v4
57+
with:
58+
go-version-file: ephemeral/go.mod
59+
6060
- name: Get latest grafana version number
6161
run: |
6262
# if package.json contains e.g. 11.0.0-pre, this writes 11.0.0 to version.txt

.github/workflows/ephemeral-instances-pr-opened-closed.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ jobs:
2929
runs-on: ubuntu-latest
3030
continue-on-error: true
3131
steps:
32-
- name: Setup Go
33-
uses: actions/setup-go@v4
34-
with:
35-
go-version: '>=1.22.3'
36-
3732
- name: Generate a GitHub app installation token
3833
id: generate_token
3934
uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
@@ -49,6 +44,11 @@ jobs:
4944
ref: main
5045
path: ephemeral
5146

47+
- name: Setup Go
48+
uses: actions/setup-go@v4
49+
with:
50+
go-version-file: ephemeral/go.mod
51+
5252
- name: Get latest grafana version number
5353
run: |
5454
# if package.json contains e.g. 11.0.0-pre, this writes 11.0.0 to version.txt

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG BASE_IMAGE=alpine:3.19.1
44
ARG JS_IMAGE=node:20-alpine
55
ARG JS_PLATFORM=linux/amd64
6-
ARG GO_IMAGE=golang:1.22.3-alpine
6+
ARG GO_IMAGE=golang:1.22.4-alpine
77

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

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include .bingo/Variables.mk
99

1010

1111
GO = go
12-
GO_VERSION = 1.22.3
12+
GO_VERSION = 1.22.4
1313
GO_FILES ?= ./pkg/... ./pkg/apiserver/... ./pkg/apimachinery/... ./pkg/promlib/...
1414
SH_FILES ?= $(shell find ./scripts -name *.sh)
1515
GO_RACE := $(shell [ -n "$(GO_RACE)" -o -e ".go-race-enabled-locally" ] && echo 1 )

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/grafana/grafana
22

3-
go 1.22.3
3+
go 1.22.4
44

55
// Override docker/docker to avoid:
66
// go: github.com/drone-runners/[email protected] requires

go.work

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.22.3
1+
go 1.22.4
22

33
use (
44
.

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.50"
6-
golang_version = "1.22.3"
6+
golang_version = "1.22.4"
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)