From 8d9b6803e4edbd669776a07ae44a71d293626e76 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Wed, 10 Jan 2024 17:44:01 +0800 Subject: [PATCH] Pin Golang version to v1.26.6 for release-1.9 Bump the Velero version too. Signed-off-by: Xun Jiang --- .github/workflows/pr.yaml | 2 +- .github/workflows/push.yml | 2 +- Dockerfile | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e88e47c..51aeeb3 100644 --- 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.21' + go-version: '1.21.6' id: go - name: Check out the code diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 5b9314d..118547a 100644 --- 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.21' + go-version: '1.21.6' id: go - name: Check out code into the Go module directory diff --git a/Dockerfile b/Dockerfile index 9bea623..0ae4143 100644 --- 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.21-bookworm AS build +FROM --platform=$BUILDPLATFORM golang:1.21.6-bookworm AS build ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index 8e2fbb6..ea318c8 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/vmware-tanzu/velero-plugin-for-gcp go 1.21 -toolchain go1.21.3 +toolchain go1.21.6 require ( cloud.google.com/go/storage v1.33.0 @@ -11,7 +11,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 - github.com/vmware-tanzu/velero v0.0.0-20231212044725-5f14628d696e + github.com/vmware-tanzu/velero v0.0.0-20240110095251-6e90e628aa57 golang.org/x/oauth2 v0.13.0 google.golang.org/api v0.146.0 k8s.io/api v0.25.6 diff --git a/go.sum b/go.sum index 6993262..52c0c12 100644 --- a/go.sum +++ b/go.sum @@ -577,8 +577,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/vmware-tanzu/velero v0.0.0-20231212044725-5f14628d696e h1:zMMt5SjWEYKU90iy9ALecKEOMtURsAhfoYerVfPThX4= -github.com/vmware-tanzu/velero v0.0.0-20231212044725-5f14628d696e/go.mod h1:yAsKjuJCEJBQhLOttEckJRplx6sLSOfrRZjEzqoQVJs= +github.com/vmware-tanzu/velero v0.0.0-20240110095251-6e90e628aa57 h1:hquLxmloRsnh46+p5FjCF7clMJiJRyaes88EGfO6qJ8= +github.com/vmware-tanzu/velero v0.0.0-20240110095251-6e90e628aa57/go.mod h1:87DH9gnd/uTRmsjLk7wc2JWsK+RjIqX4VEt6z5qkAfA= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=