Skip to content

Commit 7e3af80

Browse files
authored
Merge pull request kubernetes-sigs#257 from nunnatsa/bump-go-1.20
Bump golang to 1.20
2 parents a7dfcad + 1dd9702 commit 7e3af80

File tree

8 files changed

+31
-30
lines changed

8 files changed

+31
-30
lines changed

.github/workflows/clusterkubevirtadm-test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
clusterkubevirtadm-unit_test:
1313
runs-on: ubuntu-latest
1414
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v3
1517
- name: Install Go
16-
uses: actions/setup-go@v2
18+
uses: actions/setup-go@v4
1719
with:
18-
go-version: 1.18
19-
- name: Checkout code
20-
uses: actions/checkout@v2
20+
go-version-file: go.mod
2121
- name: Test
2222
run: make clusterkubevirtadm-test
2323
- name: Build for linux

.github/workflows/create_release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
1414
- name: Set up QEMU
1515
uses: docker/setup-qemu-action@v2
1616
- name: build image
@@ -29,11 +29,11 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Checkout code
32-
uses: actions/checkout@v2
32+
uses: actions/checkout@v3
3333
- name: Set up Go
34-
uses: actions/setup-go@v2
34+
uses: actions/setup-go@v4
3535
with:
36-
go-version: '1.18'
36+
go-version-file: go.mod
3737
- name: Install kustomize
3838
run: curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
3939
- name: Create infrastructure components

.github/workflows/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
if: (github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt') && contains(github.event.pull_request.labels.*.name, 'ok-to-test')
1010
steps:
1111
- name: Checkout code
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1313
with:
1414
fetch-depth: 0
1515
repository: kubevirt/project-infra

.github/workflows/image_build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout code
10-
uses: actions/checkout@v2
10+
uses: actions/checkout@v3
1111
- name: Set up QEMU
1212
uses: docker/setup-qemu-action@v2
1313
- name: build image

.github/workflows/test.yaml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ jobs:
55
if: (github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt')
66
strategy:
77
matrix:
8-
go-version: [1.18.x]
98
os: [ubuntu-latest, macos-latest, windows-latest]
109
runs-on: ${{ matrix.os }}
11-
steps:
12-
- name: Install Go
13-
uses: actions/setup-go@v2
14-
with:
15-
go-version: ${{ matrix.go-version }}
10+
steps:
1611
- name: Checkout code
17-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
13+
- name: Install Go
14+
uses: actions/setup-go@v4
15+
with:
16+
go-version-file: go.mod
1817
- name: Test
1918
run: make test
2019
- name: Build
@@ -24,12 +23,12 @@ jobs:
2423
if: (github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt')
2524
runs-on: ubuntu-latest
2625
steps:
26+
- name: Checkout code
27+
uses: actions/checkout@v3
2728
- name: Install Go
28-
uses: actions/setup-go@v2
29+
uses: actions/setup-go@v4
2930
with:
30-
go-version: 1.18.x
31-
- name: Checkout code
32-
uses: actions/checkout@v2
31+
go-version-file: go.mod
3332
- name: Test with coverage
3433
env:
3534
TEST_ARGS: -covermode atomic -outputdir=./coverprofiles -coverprofile=cover.coverprofile
@@ -46,7 +45,11 @@ jobs:
4645
go-linter:
4746
runs-on: ubuntu-latest
4847
steps:
49-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v3
49+
- name: Install Go
50+
uses: actions/setup-go@v4
51+
with:
52+
go-version-file: go.mod
5053
- name: golangci-lint
5154
uses: golangci/golangci-lint-action@v3
5255
with: # TODO: remove this when the deprecated function will be removed (issue #85)
@@ -55,12 +58,10 @@ jobs:
5558
check-gen:
5659
runs-on: ubuntu-latest
5760
steps:
61+
- uses: actions/checkout@v3
5862
- name: Install Go
59-
uses: actions/setup-go@v2
63+
uses: actions/setup-go@v4
6064
with:
61-
go-version: 1.18.x
62-
- uses: actions/checkout@v2
65+
go-version-file: go.mod
6366
- name: Check that 'make generate' has being call
6467
run: make check-gen
65-
66-

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# Build the manager binary
1818
# Run this with docker build --build-arg builder_image=<golang:x.y.z>
19-
ARG builder_image=golang:1.18.2
19+
ARG builder_image=golang:1.20
2020
FROM ${builder_image} as builder
2121
WORKDIR /workspace
2222

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ modules: ## Runs go mod to ensure modules are up to date.
205205
.PHONY: docker-pull-prerequisites
206206
docker-pull-prerequisites:
207207
docker pull docker.io/docker/dockerfile:1.4
208-
docker pull docker.io/library/golang:1.18.2
208+
docker pull docker.io/library/golang:1.20
209209
docker pull gcr.io/distroless/static:latest
210210

211211
.PHONY: docker-build

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cluster-api-provider-kubevirt
22

3-
go 1.18
3+
go 1.20
44

55
require (
66
github.com/go-logr/logr v1.2.3

0 commit comments

Comments
 (0)