Skip to content

Commit 54c03e5

Browse files
committed
Bump to go 1.17
1 parent 19df107 commit 54c03e5

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Install Go
1414
uses: actions/setup-go@v1
1515
with:
16-
go-version: 1.16
16+
go-version: 1.17
1717
- name: Install golangci-lint
1818
run: >
1919
cd /tmp &&
@@ -33,7 +33,7 @@ jobs:
3333
test:
3434
strategy:
3535
matrix:
36-
go-versions: [1.16, 1.15]
36+
go-versions: [1.17, 1.16]
3737
platform: [ubuntu-20.04]
3838
environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
3939
runs-on: ${{ matrix.platform }}
@@ -54,7 +54,7 @@ jobs:
5454
test-integration:
5555
strategy:
5656
matrix:
57-
go-versions: [1.16, 1.15]
57+
go-versions: [1.17, 1.16]
5858
platform: [ubuntu-20.04]
5959
environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
6060
runs-on: ${{ matrix.platform }}

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ docker-%:
8686
@docker build -t cadvisor:$(shell git rev-parse --short HEAD) -f deploy/Dockerfile$(Dockerfile_tag) .
8787

8888
docker-build:
89-
@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.16 make build
89+
@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.17 make build
9090

9191
presubmit: vet
9292
@echo ">> checking go formatting"

build/integration-in-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,5 @@ GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"}
7070
PACKAGES=${PACKAGES:-"sudo"}
7171
BUILD_PACKAGES=${BUILD_PACKAGES:-}
7272
CADVISOR_ARGS=${CADVISOR_ARGS:-}
73-
GOLANG_VERSION=${GOLANG_VERSION:-"1.16"}
73+
GOLANG_VERSION=${GOLANG_VERSION:-"1.17"}
7474
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
@@ -44,5 +44,5 @@ function run_tests() {
4444

4545
GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"}
4646
BUILD_PACKAGES=${BUILD_PACKAGES:-}
47-
GOLANG_VERSION=${GOLANG_VERSION:-"1.16"}
47+
GOLANG_VERSION=${GOLANG_VERSION:-"1.17"}
4848
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.16
1+
FROM golang:1.17
22
33

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

0 commit comments

Comments
 (0)