Skip to content

Commit

Permalink
Merge pull request #98 from thomasferrandiz/bump-go-1.22
Browse files Browse the repository at this point in the history
Bump go to 1.22
  • Loading branch information
thomasferrandiz authored Sep 10, 2024
2 parents 1257a5a + 3bcc5a8 commit 447eb97
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/buildTests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [ "1.21.11" ]
go: [ "1.22.7" ]
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- created

env:
GO_VERSION: "1.21.11"
GO_VERSION: "1.22.7"
REPOSITORY: flannel/flannel-cni-plugin

jobs:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ else
endif

# Go version to use for builds. Can be overridden
GOLANG_VERSION?=1.21.11
GOLANG_VERSION?=1.22.7

build_all: vendor build_all_linux build_windows
@echo "All arches should be built for $(TAG)"
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/flannel-io/cni-plugin

go 1.21
go 1.22

require (
github.com/containernetworking/cni v1.2.3
Expand Down
2 changes: 1 addition & 1 deletion scripts/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.21.9}
GOLANG_VERSION=${GOLANG_VERSION:-1.22.7}

if [ -d .git ]; then
if [ -z "${GIT_TAG}" ]; then
Expand Down

0 comments on commit 447eb97

Please sign in to comment.