From 6ac085316d325a2998d66f9da6a62845964c98f4 Mon Sep 17 00:00:00 2001 From: Xun Jiang/Bruce Jiang <59276555+blackpiglet@users.noreply.github.com> Date: Sun, 23 Apr 2023 12:07:48 +0800 Subject: [PATCH] Update Golang to v1.20 for release-1.11 branch. (#6159) Signed-off-by: Xun Jiang Co-authored-by: Xun Jiang --- .github/workflows/crds-verify-kind.yaml | 2 +- .github/workflows/e2e-test-kind.yaml | 4 ++-- .github/workflows/pr-ci-check.yml | 2 +- .github/workflows/push.yml | 2 +- Dockerfile | 4 ++-- Tiltfile | 2 +- hack/build-image/Dockerfile | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/crds-verify-kind.yaml b/.github/workflows/crds-verify-kind.yaml index 836e6dea3..700b23494 100644 --- a/.github/workflows/crds-verify-kind.yaml +++ b/.github/workflows/crds-verify-kind.yaml @@ -14,7 +14,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19.8 + go-version: '1.20.3' id: go # Look for a CLI that's made for this PR - name: Fetch built CLI diff --git a/.github/workflows/e2e-test-kind.yaml b/.github/workflows/e2e-test-kind.yaml index ef3548f25..ef94e2e7b 100644 --- a/.github/workflows/e2e-test-kind.yaml +++ b/.github/workflows/e2e-test-kind.yaml @@ -14,7 +14,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19.8 + go-version: '1.20.3' id: go # Look for a CLI that's made for this PR - name: Fetch built CLI @@ -72,7 +72,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19.8 + go-version: '1.20.3' id: go - name: Check out the code uses: actions/checkout@v2 diff --git a/.github/workflows/pr-ci-check.yml b/.github/workflows/pr-ci-check.yml index d70d96e93..c87ca4946 100644 --- a/.github/workflows/pr-ci-check.yml +++ b/.github/workflows/pr-ci-check.yml @@ -10,7 +10,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19.8 + go-version: '1.20.3' id: go - name: Check out the code uses: actions/checkout@v2 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f17e6873b..1deef6272 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.19.8 + go-version: '1.20.3' id: go - uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 3ea048776..e07d4bd2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.19.8-bullseye as velero-builder +FROM --platform=$BUILDPLATFORM golang:1.20.3-bullseye as velero-builder ARG GOPROXY ARG BIN @@ -44,7 +44,7 @@ RUN mkdir -p /output/usr/bin && \ -ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN} # Restic binary build section -FROM --platform=$BUILDPLATFORM golang:1.19.8-bullseye as restic-builder +FROM --platform=$BUILDPLATFORM golang:1.20.3-bullseye as restic-builder ARG BIN ARG TARGETOS diff --git a/Tiltfile b/Tiltfile index 866410de9..967acd9b8 100644 --- a/Tiltfile +++ b/Tiltfile @@ -50,7 +50,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip( tilt_helper_dockerfile_header = """ # Tilt image -FROM golang:1.19.8 as tilt-helper +FROM golang:1.20.3 as tilt-helper # Support live reloading with Tilt RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \ diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index b12179aa4..9e29e668d 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=linux/amd64 golang:1.19.8-bullseye +FROM --platform=linux/amd64 golang:1.20.3-bullseye ARG GOPROXY