Skip to content

Commit 98c6414

Browse files
authored
Merge pull request #3258 from bobbypage/golang120
build: bump golang to 1.20
2 parents 42eef7f + e6f8575 commit 98c6414

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.github/workflows/test.yml

Lines changed: 2 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.19, 1.18]
7+
go-versions: ['1.20', '1.19']
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 }}
@@ -30,7 +30,7 @@ jobs:
3030
test-integration:
3131
strategy:
3232
matrix:
33-
go-versions: [1.19, 1.18]
33+
go-versions: ['1.20', '1.19']
3434
platform: [ubuntu-20.04]
3535
environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
3636
runs-on: ${{ matrix.platform }}

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.19 make 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
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.19"}
75+
GOLANG_VERSION=${GOLANG_VERSION:-"1.20"}
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.19"}
43+
GOLANG_VERSION=${GOLANG_VERSION:-"1.20"}
4444
run_tests

deploy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mirror.gcr.io/library/golang:1.19-alpine3.16 AS build
1+
FROM registry.hub.docker.com/library/golang:1.20-alpine3.16 AS build
22

33
# Install build depdencies for all supported arches
44
RUN apk --no-cache add bash build-base cmake device-mapper findutils git \

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.19
1+
FROM golang:1.20
22
33

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

0 commit comments

Comments
 (0)