Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: Upgrade Go to 1.20.10 #76355

Merged
merged 2 commits into from
Oct 11, 2023
Merged

Chore: Upgrade Go to 1.20.10 #76355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89c8791
[v10.1.x] Chore: Upgrade Go to 1.20.10
zerok Oct 11, 2023
2685f97
Rebuild .drone.yml
zerok Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
58 changes: 29 additions & 29 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- ./bin/build verify-drone
Expand Down Expand Up @@ -74,7 +74,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- ./bin/build verify-starlark .
Expand Down Expand Up @@ -313,7 +313,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
Expand Down Expand Up @@ -399,7 +399,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST"
Expand Down Expand Up @@ -433,12 +433,12 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.20.8
image: golang:1.20.10
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
failure: ignore
image: golang:1.20.8
image: golang:1.20.10
name: validate-modfile
trigger:
event:
Expand Down Expand Up @@ -494,7 +494,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
Expand Down Expand Up @@ -903,7 +903,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
Expand Down Expand Up @@ -1123,7 +1123,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- ./bin/build shellcheck
Expand Down Expand Up @@ -1225,7 +1225,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
Expand Down Expand Up @@ -1533,7 +1533,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
Expand Down Expand Up @@ -1614,7 +1614,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- make gen-go
Expand All @@ -1628,12 +1628,12 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.20.8
image: golang:1.20.10
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
failure: ignore
image: golang:1.20.8
image: golang:1.20.10
name: validate-modfile
- commands:
- ./bin/build verify-drone
Expand Down Expand Up @@ -1689,7 +1689,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
Expand Down Expand Up @@ -2159,7 +2159,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
Expand Down Expand Up @@ -2502,7 +2502,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- ./bin/build artifacts docker fetch --edition oss
Expand Down Expand Up @@ -2598,7 +2598,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
Expand Down Expand Up @@ -2667,7 +2667,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- yarn install --immutable
Expand Down Expand Up @@ -2732,7 +2732,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- depends_on:
- compile-build-cmd
Expand Down Expand Up @@ -2820,13 +2820,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- ./bin/build whatsnew-checker
depends_on:
- compile-build-cmd
image: golang:1.20.8
image: golang:1.20.10
name: whats-new-checker
trigger:
event:
Expand Down Expand Up @@ -2928,7 +2928,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
Expand Down Expand Up @@ -3308,7 +3308,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
Expand Down Expand Up @@ -3620,7 +3620,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
Expand Down Expand Up @@ -4433,7 +4433,7 @@ steps:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.18.3
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM byrnedo/alpine-curl:0.1.8
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.8
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.10
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM postgres:12.3-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:5.7.39
Expand All @@ -4460,7 +4460,7 @@ steps:
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3
- trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.18.3
- trivy --exit-code 1 --severity HIGH,CRITICAL byrnedo/alpine-curl:0.1.8
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.8
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.10
- trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack
- trivy --exit-code 1 --severity HIGH,CRITICAL postgres:12.3-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL mysql:5.7.39
Expand Down Expand Up @@ -4512,7 +4512,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8
image: golang:1.20.10
name: compile-build-cmd
- commands:
- ./bin/build publish grafana-com --edition oss
Expand Down Expand Up @@ -4709,6 +4709,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: 9ec562101f20b3ba21963a1cc84ba41aae48cf1765f96fb27e2f9d392bf5bbbd
hmac: acc8c779e94b93bc2b5316ace9506384a75eef8b58504fd53104e7edc4a58a84

...
2 changes: 1 addition & 1 deletion .github/workflows/alerting-swagger-gen.yml
View file
Open in desktop
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.20.8'
go-version: '1.20.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
View file
Open in desktop
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.20.8'
go-version: '1.20.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
View file
Open in desktop
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.20.8'
go-version: '1.20.10'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-kinds-next.yml
View file
Open in desktop
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.20.8'
go-version: '1.20.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
View file
Open in desktop
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.20.8'
go-version: '1.20.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
View file
Open in desktop
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.20.8'
go-version: '1.20.10'

- name: "Verify kinds"
run: go run .github/workflows/scripts/kinds/verify-kinds.go
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.20.8-alpine3.18
ARG GO_IMAGE=golang:1.20.10-alpine3.18

ARG GO_SRC=go-builder
ARG JS_SRC=js-builder
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
--build-arg BASE_IMAGE=ubuntu:20.04 \
--build-arg GO_IMAGE=golang:1.20.8 \
--build-arg GO_IMAGE=golang:1.20.10 \
--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
$(DOCKER_BUILD_ARGS)

Expand Down
2 changes: 1 addition & 1 deletion scripts/build/ci-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz
# Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's.
FROM debian:buster-20220822

ENV GOVERSION=1.20.8 \
ENV GOVERSION=1.20.10 \
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=18.12.0-1nodesource1 \
Expand Down
2 changes: 1 addition & 1 deletion scripts/drone/utils/images.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ images = {
"publish_image": "grafana/grafana-ci-deploy:1.3.3",
"alpine_image": "alpine:3.18.3",
"curl_image": "byrnedo/alpine-curl:0.1.8",
"go_image": "golang:1.20.8",
"go_image": "golang:1.20.10",
"plugins_slack_image": "plugins/slack",
"postgres_alpine_image": "postgres:12.3-alpine",
"mysql5_image": "mysql:5.7.39",
Expand Down