Skip to content

Commit

Permalink
[Housekeeping] Bump Go version to 1.22 (#5032)
Browse files Browse the repository at this point in the history
* update go 1.22 & make go-tidy

Signed-off-by: Ryan Lo <[email protected]>

* update Dockerfiles

Signed-off-by: Ryan Lo <[email protected]>

* update gha workflows

Signed-off-by: Ryan Lo <[email protected]>

* upgrade x tools to fix panic crash in go 1.22

Signed-off-by: Ryan Lo <[email protected]>

* go mod tidy

Signed-off-by: Ryan Lo <[email protected]>

* update gha workflows

Signed-off-by: Ryan Lo <[email protected]>

* (flytestdlib) go mod tidy

Signed-off-by: Ryan Lo <[email protected]>

* trigger tests

Signed-off-by: Ryan Lo <[email protected]>

* * bump arduino/setup-protoc to v3
* go mod tidy for flytectl/go.mod

Signed-off-by: Ryan Lo <[email protected]>

* update go version for sandbox-bundled

Signed-off-by: Ryan Lo <[email protected]>

* chore

Signed-off-by: Ryan Lo <[email protected]>

* update boilerplate/flyte/golang_support_tools/go.mod

Signed-off-by: Ryan Lo <[email protected]>

---------

Signed-off-by: Ryan Lo <[email protected]>
Signed-off-by: WenChih Lo <[email protected]>
  • Loading branch information
lowc1012 authored Jul 22, 2024
1 parent 337088e commit 02a0d2e
Show file tree
Hide file tree
Showing 27 changed files with 43 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
branches:
- master
env:
GO_VERSION: "1.21"
GO_VERSION: "1.22"
PRIORITIES: "P0"
jobs:
unpack-envvars:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flyteidl-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
branches:
- master
env:
GO_VERSION: "1.21"
GO_VERSION: "1.22"
jobs:
unpack-envvars:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/generate_flyte_manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: "0"
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
- name: Update references
env:
VERSION: ${{ github.event.inputs.next-version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go_generate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
working-directory: ${{ inputs.component }}
steps:
- uses: actions/checkout@v4
- uses: arduino/setup-protoc@v1
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.FLYTE_BOT_PAT }}
- uses: bufbuild/buf-setup-action@v1
with:
github_token: ${{ secrets.FLYTE_BOT_PAT }}
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ inputs.go-version }}
- name: Go generate and diff
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
with:
version: "v0.11.1"
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ inputs.go-version }}
- name: Integration
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ inputs.go-version }}
- name: Lint
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/single-binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
- name: Fetch the code
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
- name: Compile
run: make compile
- name: Run tests
Expand Down Expand Up @@ -75,8 +75,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
- name: Helm and diff
run: DELTA_CHECK=true make helm
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ inputs.go-version }}
- name: Unit Tests
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG FLYTECONSOLE_VERSION=latest
FROM ghcr.io/flyteorg/flyteconsole:${FLYTECONSOLE_VERSION} AS flyteconsole


FROM --platform=${BUILDPLATFORM} golang:1.21-bookworm AS flytebuilder
FROM --platform=${BUILDPLATFORM} golang:1.22-bookworm AS flytebuilder

ARG TARGETARCH
ENV GOARCH "${TARGETARCH}"
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.datacatalog
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
#
# TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst

FROM --platform=${BUILDPLATFORM} golang:1.21-alpine3.18 as builder
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder


ARG TARGETARCH
ENV GOARCH "${TARGETARCH}"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.flyteadmin
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst

FROM --platform=${BUILDPLATFORM} golang:1.21-alpine3.18 as builder
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder

ARG TARGETARCH
ENV GOARCH "${TARGETARCH}"
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.flytecopilot
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
#
# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst

FROM --platform=${BUILDPLATFORM} golang:1.21-alpine3.18 as builder
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder


ARG TARGETARCH
ENV GOARCH "${TARGETARCH}"
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.flytepropeller
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
#
# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst

FROM --platform=${BUILDPLATFORM} golang:1.21-alpine3.18 as builder

FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder


ARG TARGETARCH
ENV GOARCH "${TARGETARCH}"
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.flytescheduler
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
#
# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst

FROM --platform=${BUILDPLATFORM} golang:1.21-alpine3.18 as builder

FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder


ARG TARGETARCH
ENV GOARCH "${TARGETARCH}"
Expand Down
4 changes: 1 addition & 3 deletions boilerplate/flyte/golang_support_tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/flyteorg/boilerplate

go 1.21

toolchain go1.21.7
go 1.22

require (
github.com/EngHabu/mockery v0.0.0-20220916190332-dde70e38baba
Expand Down
4 changes: 3 additions & 1 deletion datacatalog/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/flyteorg/flyte/datacatalog

go 1.21
go 1.22

toolchain go1.22.1

require (
github.com/Selvatico/go-mocket v1.0.7
Expand Down
2 changes: 1 addition & 1 deletion docker/sandbox-bundled/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY images/manifest.txt images/preload ./
RUN --security=insecure ./preload manifest.txt


FROM --platform=${BUILDPLATFORM} golang:1.19-bullseye AS bootstrap
FROM --platform=${BUILDPLATFORM} golang:1.22-bullseye AS bootstrap

ARG TARGETARCH
ENV CGO_ENABLED 0
Expand Down
2 changes: 1 addition & 1 deletion docker/sandbox-bundled/bootstrap/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/flyteorg/flyte/docker/sandbox-bundled/bootstrap

go 1.21
go 1.22

require (
github.com/stretchr/testify v1.8.0
Expand Down
2 changes: 1 addition & 1 deletion flyteadmin/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/flyteorg/flyte/flyteadmin

go 1.21
go 1.22

require (
cloud.google.com/go/iam v1.1.5
Expand Down
2 changes: 1 addition & 1 deletion flytecopilot/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/flyteorg/flyte/flytecopilot

go 1.21
go 1.22

require (
github.com/aws/aws-sdk-go v1.44.2
Expand Down
4 changes: 3 additions & 1 deletion flytectl/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/flyteorg/flyte/flytectl

go 1.21
go 1.22

toolchain go1.22.0

require (
github.com/apoorvam/goterminal v0.0.0-20180523175556-614d345c47e5
Expand Down
4 changes: 1 addition & 3 deletions flyteidl/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/flyteorg/flyte/flyteidl

go 1.21

toolchain go1.21.3
go 1.22

require (
github.com/flyteorg/flyte/flytestdlib v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion flyteplugins/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/flyteorg/flyte/flyteplugins

go 1.21
go 1.22

require (
github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20200723154620-6f35a1152625
Expand Down
2 changes: 1 addition & 1 deletion flytepropeller/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/flyteorg/flyte/flytepropeller

go 1.21
go 1.22

require (
github.com/DiSiqueira/GoTree v1.0.1-0.20180907134536-53a8e837f295
Expand Down
2 changes: 1 addition & 1 deletion flytestdlib/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/flyteorg/flyte/flytestdlib

go 1.21
go 1.22

require (
github.com/aws/aws-sdk-go v1.44.2
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/flyteorg/flyte

go 1.21
go 1.22

require (
github.com/flyteorg/flyte/datacatalog v0.0.0-00010101000000-000000000000
Expand Down

0 comments on commit 02a0d2e

Please sign in to comment.