Skip to content

Commit

Permalink
[v10.1.x] Chore: Upgrade go to 1.21.10 (#87476)
Browse files Browse the repository at this point in the history
* [v10.1.x] Chore: Upgrade go to 1.21.10

---------

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Co-authored-by: Dave Henderson <dave.henderson@grafana.com>
Co-authored-by: Matias Chomicki <matyax@gmail.com>
  • Loading branch information
4 people committed May 10, 2024
1 parent f713e15 commit 7b442dc
Show file tree
Hide file tree
Showing 13 changed files with 112 additions and 115 deletions.
202 changes: 101 additions & 101 deletions .drone.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/workflows/alerting-swagger-gen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set go version
uses: actions/setup-go@v4
with:
go-version: '1.21.8'
go-version: '1.21.10'
- name: Build swagger
run: |
make -C pkg/services/ngalert/api/tooling post.json api.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
name: Set go version
uses: actions/setup-go@v4
with:
go-version: '1.21.8'
go-version: '1.21.10'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-codeql-analysis-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set go version
uses: actions/setup-go@v4
with:
go-version: '1.21.8'
go-version: '1.21.10'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-kinds-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: "Setup Go"
uses: "actions/setup-go@v4"
with:
go-version: '1.21.8'
go-version: '1.21.10'

- name: "Verify kinds"
run: go run .github/workflows/scripts/kinds/verify-kinds.go
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-kinds-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: "Setup Go"
uses: "actions/setup-go@v4"
with:
go-version: '1.21.8'
go-version: '1.21.10'

- name: "Verify kinds"
run: go run .github/workflows/scripts/kinds/verify-kinds.go
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-kinds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: "Setup Go"
uses: "actions/setup-go@v4"
with:
go-version: '1.21.8'
go-version: '1.21.10'

- name: "Verify kinds"
run: go run .github/workflows/scripts/kinds/verify-kinds.go
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ARG BASE_IMAGE=alpine:3.19.1
ARG JS_IMAGE=node:18-alpine
ARG JS_PLATFORM=linux/amd64
ARG GO_IMAGE=golang:1.21.8-alpine
ARG GO_IMAGE=golang:1.21.10-alpine

ARG GO_SRC=go-builder
ARG JS_SRC=js-builder
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.8 \
--build-arg GO_IMAGE=golang:1.21.10 \
--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
$(DOCKER_BUILD_ARGS)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/grafana/grafana

go 1.20
go 1.21.10

// Override xorm's outdated go-mssqldb dependency, since we can't upgrade to current xorm (due to breaking changes).
// We need a more current go-mssqldb so we get rid of a version of apache/thrift with vulnerabilities.
Expand Down
3 changes: 0 additions & 3 deletions pkg/web/macaron.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//go:build go1.3
// +build go1.3

// Copyright 2014 The Macaron Authors
//
// Licensed under the Apache License, Version 2.0 (the "License"): you may
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jest.mock('@grafana/data', () => ({

const now = dateTime().valueOf();
const intervalInSeconds = 60 * 5;
const endInput = encodeURIComponent(dateTime(now).add(5, 'hours').format('Y-MM-DD HH:mm'));
const endInput = encodeURIComponent(dateTime(now).utc().format('Y-MM-DD HH:mm'));

const getPanelData = (panelDataOverrides?: Partial<PanelData>) => {
const panelData = {
Expand Down
2 changes: 1 addition & 1 deletion scripts/drone/variables.star
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ global variables
"""

grabpl_version = "v3.0.50"
golang_version = "1.21.8"
golang_version = "1.21.10"

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

0 comments on commit 7b442dc

Please sign in to comment.