Skip to content

Commit 4fc16b3

Browse files
authored
Merge pull request #1355 from Nordix/fix-cve-moshiur
Support go 1.22 and 1.23 build to fix CVE
2 parents 781ecda + ddbcd2c commit 4fc16b3

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
build:
55
strategy:
66
matrix:
7-
go-version: [1.20.x, 1.21.x]
7+
go-version: [1.22.x, 1.23.x]
88
goarch: [386, amd64, arm, arm64, ppc64le, s390x]
99
os: [ubuntu-latest] #, macos-latest, windows-latest]
1010
runs-on: ${{ matrix.os }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.19.x
18+
go-version: 1.22.x
1919

2020
- name: Run GoReleaser
2121
uses: goreleaser/goreleaser-action@v5

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
test:
55
strategy:
66
matrix:
7-
go-version: [1.20.x, 1.21.x]
7+
go-version: [1.22.x, 1.23.x]
88
os: [ubuntu-latest]
99
runs-on: ${{ matrix.os }}
1010
steps:

images/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This Dockerfile is used to build the image available on DockerHub
2-
FROM --platform=$BUILDPLATFORM golang:1.21 as build
2+
FROM --platform=$BUILDPLATFORM golang:1.23 as build
33

44
# Add everything
55
ADD . /usr/src/multus-cni

images/Dockerfile.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This Dockerfile is used to build the image available on DockerHub
2-
FROM --platform=$BUILDPLATFORM golang:1.21 as build
2+
FROM --platform=$BUILDPLATFORM golang:1.23 as build
33

44
# Add everything
55
ADD . /usr/src/multus-cni

images/Dockerfile.thick

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This Dockerfile is used to build the image available on DockerHub
2-
FROM golang:1.21 as build
2+
FROM golang:1.23 as build
33

44
# Add everything
55
ADD . /usr/src/multus-cni

0 commit comments

Comments
 (0)