Skip to content

Commit a2b1f51

Browse files
committed
Bump golang to 1.22
* Also bump golang ci 1.56.2 Signed-off-by: David Porter <[email protected]>
1 parent 51d8705 commit a2b1f51

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
test:
55
strategy:
66
matrix:
7-
go-versions: ['1.20', '1.19']
7+
go-versions: ['1.22', '1.21']
88
platform: [ubuntu-20.04]
99
environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
1010
runs-on: ${{ matrix.platform }}
@@ -14,6 +14,7 @@ jobs:
1414
uses: actions/setup-go@v5
1515
with:
1616
go-version: ${{ matrix.go-versions }}
17+
check-latest: true
1718
- name: Checkout code
1819
uses: actions/checkout@v4
1920
- name: Run presubmit checks
@@ -30,7 +31,7 @@ jobs:
3031
test-integration:
3132
strategy:
3233
matrix:
33-
go-versions: ['1.20', '1.19']
34+
go-versions: ['1.22', '1.21']
3435
platform: [ubuntu-20.04]
3536
environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
3637
runs-on: ${{ matrix.platform }}

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
GO := go
16-
GOLANGCI_VER := v1.54.1
16+
GOLANGCI_VER := v1.56.2
1717
GO_TEST ?= $(GO) test $(or $(GO_FLAGS),-race)
1818
arch ?= $(shell go env GOARCH)
1919

@@ -72,7 +72,7 @@ docker-%:
7272
@docker build -t cadvisor:$(shell git rev-parse --short HEAD) -f deploy/Dockerfile .
7373

7474
docker-build:
75-
@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.20 make build
75+
@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.22 make build
7676

7777
presubmit: lint
7878
@echo ">> checking go mod tidy"

build/integration-in-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"}
7272
PACKAGES=${PACKAGES:-"sudo"}
7373
BUILD_PACKAGES=${BUILD_PACKAGES:-}
7474
CADVISOR_ARGS=${CADVISOR_ARGS:-}
75-
GOLANG_VERSION=${GOLANG_VERSION:-"1.20"}
75+
GOLANG_VERSION=${GOLANG_VERSION:-"1.22"}
7676
run_tests "$GO_FLAGS" "$PACKAGES" "$BUILD_PACKAGES" "$CADVISOR_ARGS"

build/unit-in-container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ function run_tests() {
4040

4141
GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"}
4242
BUILD_PACKAGES=${BUILD_PACKAGES:-}
43-
GOLANG_VERSION=${GOLANG_VERSION:-"1.20"}
43+
GOLANG_VERSION=${GOLANG_VERSION:-"1.22"}
4444
run_tests

deploy/canary/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20
1+
FROM golang:1.22
22
33

44
RUN apt-get update && apt-get install -y git dmsetup && apt-get clean

0 commit comments

Comments
 (0)