Skip to content

Commit 529d124

Browse files
authored
Merge pull request #1132 from marquiz/devel/golang-update
Bump golang to v1.24
2 parents 81af441 + 1151a99 commit 529d124

File tree

15 files changed

+31
-102
lines changed

15 files changed

+31
-102
lines changed

.github/workflows/common-codeql.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Upload PDF report as an artifact
4343
if: ${{ inputs.export-report }}
44-
uses: actions/upload-artifact@v3
44+
uses: actions/upload-artifact@v4
4545
with:
4646
name: codeql-report
4747
path: report.pdf

.github/workflows/common-trivy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989

9090
- name: Upload CSV report as an artifact
9191
if: ${{ inputs.export-csv }}
92-
uses: actions/upload-artifact@v3
92+
uses: actions/upload-artifact@v4
9393
with:
9494
name: trivy-report
9595
path: trivy-report.csv

.github/workflows/common-verify-code.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
id: go
2121

2222
- name: Install golangci-lint
23-
run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
23+
run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.7
2424

2525
- name: Gofmt
2626
run: make format

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GO_FMT := gofmt
1111
GO_CYCLO := gocyclo
1212
GO_LINT := golint
1313
GO_CILINT := golangci-lint
14-
GO_VERSION ?= 1.22.11
14+
GO_VERSION ?= 1.24.1
1515
GOLICENSES_VERSION ?= v1.5.0
1616

1717
# TEST_TAGS is the set of extra build tags passed for tests.
@@ -24,7 +24,7 @@ TEST_SETUP := test-setup.sh
2424
TEST_CLEANUP := test-cleanup.sh
2525

2626
# Disable some golangci_lint checkers for now until we have an more acceptable baseline...
27-
GO_CILINT_CHECKERS := -D unused,staticcheck,errcheck,deadcode,structcheck,gosimple -E revive,gofmt
27+
GO_CILINT_CHECKERS := -D unused,staticcheck,errcheck,deadcode,structcheck,gosimple,revive -E gofmt
2828
GO_CILINT_RUNFLAGS := --build-tags $(TEST_TAGS)
2929

3030
# Protoc compiler and protobuf definitions we might need to recompile.

cmd/cri-resmgr-agent/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.22
1+
ARG GO_VERSION=1.24
22

33
FROM golang:${GO_VERSION}-bullseye as builder
44

cmd/cri-resmgr-webhook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.22
1+
ARG GO_VERSION=1.24
22

33
FROM golang:${GO_VERSION}-bullseye as builder
44

demo/lib/distro.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# shellcheck disable=SC2120
22
GO_URLDIR=https://golang.org/dl
3-
GO_VERSION=1.22.11
3+
GO_VERSION=1.24.1
44
GOLANG_URL=$GO_URLDIR/go$GO_VERSION.linux-amd64.tar.gz
55
CRICTL_VERSION=${CRICTL_VERSION:-"v1.25.0"}
66
MINIKUBE_VERSION=${MINIKUBE_VERSION:-v1.27.0}

docs/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ FROM sphinxdoc/sphinx:5.3.0
33
RUN apt-get update && apt-get install -y wget git
44

55
# Note: Any golang version that can 'go list -m -f {{.Variable}}' is fine...
6-
ADD https://go.dev/dl/go1.22.11.linux-amd64.tar.gz /
6+
ADD https://go.dev/dl/go1.24.1.linux-amd64.tar.gz /
77

8-
RUN tar -C /usr/local -xzf /go1.22.11.linux-amd64.tar.gz && \
9-
rm /go1.22.11.linux-amd64.tar.gz
8+
RUN tar -C /usr/local -xzf /go1.24.1.linux-amd64.tar.gz && \
9+
rm /go1*.linux-amd64.tar.gz
1010

1111
ENV PATH=$PATH:/usr/local/go/bin
1212

docs/developers-guide/figures/arch-overview.svg

Lines changed: 0 additions & 70 deletions
This file was deleted.

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/intel/cri-resource-manager
22

3-
go 1.22.0
3+
go 1.24
44

55
require (
66
contrib.go.opencensus.io/exporter/jaeger v0.2.1
@@ -17,7 +17,7 @@ require (
1717
github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92
1818
github.com/stretchr/testify v1.8.4
1919
go.opencensus.io v0.24.0
20-
golang.org/x/sys v0.29.0
20+
golang.org/x/sys v0.31.0
2121
golang.org/x/time v0.5.0
2222
google.golang.org/grpc v1.60.1
2323
google.golang.org/protobuf v1.33.0
@@ -62,11 +62,11 @@ require (
6262
github.com/spf13/pflag v1.0.5 // indirect
6363
github.com/uber/jaeger-client-go v2.25.0+incompatible // indirect
6464
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
65-
golang.org/x/net v0.34.0 // indirect
65+
golang.org/x/net v0.37.0 // indirect
6666
golang.org/x/oauth2 v0.15.0 // indirect
67-
golang.org/x/sync v0.10.0 // indirect
68-
golang.org/x/term v0.28.0 // indirect
69-
golang.org/x/text v0.21.0 // indirect
67+
golang.org/x/sync v0.12.0 // indirect
68+
golang.org/x/term v0.30.0 // indirect
69+
golang.org/x/text v0.23.0 // indirect
7070
google.golang.org/api v0.155.0 // indirect
7171
google.golang.org/appengine v1.6.8 // indirect
7272
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect

0 commit comments

Comments
 (0)