Skip to content

Commit

Permalink
Merge pull request k8snetworkplumbingwg#712 from bn222/master
Browse files Browse the repository at this point in the history
Bump go version to 1.22
  • Loading branch information
bn222 authored Jun 13, 2024
2 parents a767d33 + c2b3031 commit 7e5350d
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v3
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand All @@ -32,10 +32,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v2
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand Down Expand Up @@ -63,10 +63,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v2
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand All @@ -88,10 +88,10 @@ jobs:
name: Golangci-lint
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v2
with:
go-version: 1.21.x
go-version: 1.22.x
- name: Check out code into the Go module directory
uses: actions/checkout@v2
- name: golangci-lint
Expand All @@ -105,10 +105,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v2
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand Down Expand Up @@ -148,10 +148,10 @@ jobs:
- name: Check out code into the Go module directory
uses: actions/checkout@v2

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v3
with:
go-version: 1.21.x
go-version: 1.22.x

- name: run test
run: make test-e2e-conformance-virtual-k8s-cluster-ci
Expand Down Expand Up @@ -182,10 +182,10 @@ jobs:
- name: Check out code into the Go module directory
uses: actions/checkout@v2

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v3
with:
go-version: 1.21.x
go-version: 1.22.x

- name: run test
run: make test-e2e-conformance-virtual-ocp-cluster-ci
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder
WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
COPY . .
RUN make _build-manager BIN_PATH=build/_output/cmd
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.sriov-network-config-daemon
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder
WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
COPY . .
RUN make _build-sriov-network-config-daemon BIN_PATH=build/_output/cmd
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.webhook
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder
WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
COPY . .
RUN make _build-webhook BIN_PATH=build/_output/cmd
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/k8snetworkplumbingwg/sriov-network-operator

go 1.21
go 1.22

require (
github.com/Masterminds/sprig/v3 v3.2.2
Expand Down

0 comments on commit 7e5350d

Please sign in to comment.