Merge pull request #186 from blackpiglet/bump_golang_for_1.10

Bump golang and velero for release-1.10.
vmware-tanzu · May 24, 2024 · b106c15 · b106c15
2 parents 293d60d + 4a9a2f6
commit b106c15
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -10,7 +10,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: '1.22'
+        go-version: '1.22.2'
       id: go
 
     - name: Check out the code

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: '1.22'
+        go-version: '1.22.2'
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=$BUILDPLATFORM golang:1.22-bookworm AS build
+FROM --platform=$BUILDPLATFORM golang:1.22.2-bookworm AS build
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/vmware-tanzu/velero-plugin-for-gcp
 
-go 1.22.0
-
-toolchain go1.22.2
+go 1.22.2
 
 require (
 	cloud.google.com/go/storage v1.40.0
@@ -11,7 +9,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
-	github.com/vmware-tanzu/velero v0.0.0-20240516033113-a0b7382e5af6
+	github.com/vmware-tanzu/velero v0.0.0-20240524054814-9164bc95a403
 	golang.org/x/oauth2 v0.19.0
 	google.golang.org/api v0.172.0
 	k8s.io/api v0.29.0

diff --git a/go.sum b/go.sum
@@ -279,8 +279,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/vmware-tanzu/velero v0.0.0-20240516033113-a0b7382e5af6 h1:u0kEvzibgmIyaAQGFiRJKa2l/UFzKewNsti6PM1GZzA=
-github.com/vmware-tanzu/velero v0.0.0-20240516033113-a0b7382e5af6/go.mod h1:NP1qT+v1lSSWtZpx1Fph/23/iMCWv0OKTg9dP/39hZI=
+github.com/vmware-tanzu/velero v0.0.0-20240524054814-9164bc95a403 h1:rpPB7uh994I9Jxgz4qOYZOoOaG7KIq06RHPc0TaSaFs=
+github.com/vmware-tanzu/velero v0.0.0-20240524054814-9164bc95a403/go.mod h1:yeGs7/xq35yOGDPCV0ryxoybQBsTLXmrxwzXBXtiwp8=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=