diff --git a/.github/workflows/buildTests.yaml b/.github/workflows/buildTests.yaml index ef8b3f2..ddf4b06 100644 --- a/.github/workflows/buildTests.yaml +++ b/.github/workflows/buildTests.yaml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - go: [ "1.22.2" ] + go: [ "1.22.4" ] steps: - name: Check out code into the Go module directory uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 868b242..73737bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ on: - created env: - GO_VERSION: "1.22.2" + GO_VERSION: "1.22.4" REPOSITORY: flannel/flannel-cni-plugin jobs: diff --git a/Makefile b/Makefile index 54e4135..5d5a34c 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ else endif # Go version to use for builds. Can be overridden -GOLANG_VERSION?=1.22.2 +GOLANG_VERSION?=1.22.4 build_all: vendor build_all_linux build_windows @echo "All arches should be built for $(TAG)" diff --git a/go.mod b/go.mod index 0ae5bfa..5c65b56 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/flannel-io/cni-plugin -go 1.20 +go 1.22 require ( github.com/containernetworking/cni v1.1.2 diff --git a/go.sum b/go.sum index 9ad31fc..a17bc31 100644 --- a/go.sum +++ b/go.sum @@ -342,6 +342,7 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -774,6 +775,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -988,6 +990,7 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/scripts/version.sh b/scripts/version.sh index 2ea4e8d..93d5536 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -34,7 +34,7 @@ PLATFORM=${GOOS}-${GOARCH} RELEASE=${PROG}-${GOARCH} # hardcode versions unless set specifically VERSION=${VERSION:-v1.0.0} -GOLANG_VERSION=${GOLANG_VERSION:-1.22.2} +GOLANG_VERSION=${GOLANG_VERSION:-1.22.4} if [ -d .git ]; then if [ -z "${GIT_TAG}" ]; then