From a81d8b6256a8d4c4231d5e3054c2324679904f65 Mon Sep 17 00:00:00 2001 From: lostluck <13907733+lostluck@users.noreply.github.com> Date: Thu, 26 Sep 2024 13:52:23 -0700 Subject: [PATCH 1/3] Update Go version used by Beam repo. --- .../actions/setup-default-test-properties/test-properties.json | 2 +- .github/actions/setup-environment-action/action.yml | 2 +- .github/gh-actions-self-hosted-runners/arc/images/Dockerfile | 2 +- .github/workflows/build_release_candidate.yml | 2 +- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- dev-support/docker/Dockerfile | 2 +- sdks/go/run_with_go_version.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup-default-test-properties/test-properties.json b/.github/actions/setup-default-test-properties/test-properties.json index a11af748efea..098e4ca1935c 100644 --- a/.github/actions/setup-default-test-properties/test-properties.json +++ b/.github/actions/setup-default-test-properties/test-properties.json @@ -18,6 +18,6 @@ "SPARK_VERSIONS": ["2", "3"] }, "GoTestProperties": { - "SUPPORTED_VERSIONS": ["1.22"] + "SUPPORTED_VERSIONS": ["1.23"] } } diff --git a/.github/actions/setup-environment-action/action.yml b/.github/actions/setup-environment-action/action.yml index 2da2cf0becd5..72246566290d 100644 --- a/.github/actions/setup-environment-action/action.yml +++ b/.github/actions/setup-environment-action/action.yml @@ -57,5 +57,5 @@ runs: if: ${{ inputs.go-version != '' }} uses: actions/setup-go@v5 with: - go-version: ${{ inputs.go-version == 'default' && '1.22' || inputs.go-version }} # never set patch, to get latest patch releases. + go-version: ${{ inputs.go-version == 'default' && '1.23' || inputs.go-version }} # never set patch, to get latest patch releases. cache-dependency-path: $${{ inputs.disable-cache && '' || 'sdks/go.sum' }} diff --git a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile index c1c1955a2177..84117c2c07ed 100644 --- a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile +++ b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile @@ -31,7 +31,7 @@ RUN curl -OL https://nodejs.org/dist/v18.16.0/node-v18.16.0-linux-x64.tar.xz && mv /usr/local/node-v18.16.0-linux-x64 /usr/local/node ENV PATH="${PATH}:/usr/local/node/bin" #Install Go -ARG go_version=1.22.5 +ARG go_version=1.23.1 RUN curl -OL https://go.dev/dl/go${go_version}.linux-amd64.tar.gz && \ tar -C /usr/local -xzf go${go_version}.linux-amd64.tar.gz && \ rm go${go_version}.linux-amd64.tar.gz diff --git a/.github/workflows/build_release_candidate.yml b/.github/workflows/build_release_candidate.yml index ec65ae99072a..d2bd863483fc 100644 --- a/.github/workflows/build_release_candidate.yml +++ b/.github/workflows/build_release_candidate.yml @@ -433,7 +433,7 @@ jobs: fi - uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.23' - name: Import GPG key id: import_gpg uses: crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549 diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index a334cf3191f2..452a3a70cbd3 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -2221,7 +2221,7 @@ class BeamModulePlugin implements Plugin { // This sets the whole project Go version. // The latest stable Go version can be checked at https://go.dev/dl/ - project.ext.goVersion = "go1.22.5" + project.ext.goVersion = "go1.23.1" // Minor TODO: Figure out if we can pull out the GOCMD env variable after goPrepare script // completion, and avoid this GOBIN substitution. diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index d7887561b710..b5b1d01b39c6 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -78,7 +78,7 @@ RUN pip3 install distlib==0.3.1 yapf==0.29.0 pytest ### # Install Go ### -ENV DOWNLOAD_GO_VERSION=1.22.5 +ENV DOWNLOAD_GO_VERSION=1.23.1 RUN wget https://golang.org/dl/go${DOWNLOAD_GO_VERSION}.linux-amd64.tar.gz && \ tar -C /usr/local -xzf go${DOWNLOAD_GO_VERSION}.linux-amd64.tar.gz ENV GOROOT /usr/local/go diff --git a/sdks/go/run_with_go_version.sh b/sdks/go/run_with_go_version.sh index 2e542821969c..f7def520935c 100755 --- a/sdks/go/run_with_go_version.sh +++ b/sdks/go/run_with_go_version.sh @@ -37,7 +37,7 @@ set -e # # This variable is also used as the execution command downscript. # The list of downloadable versions are at https://go.dev/dl/ -GOVERS=go1.22.5 +GOVERS=go1.23.1 if ! command -v go &> /dev/null then From 1b175ebcc26981ce763684701320549f3833971d Mon Sep 17 00:00:00 2001 From: lostluck <13907733+lostluck@users.noreply.github.com> Date: Thu, 26 Sep 2024 14:00:05 -0700 Subject: [PATCH 2/3] update release docker in docker container --- release/src/main/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/src/main/Dockerfile b/release/src/main/Dockerfile index 8f981fddfcd8..14fe6fdb5a49 100644 --- a/release/src/main/Dockerfile +++ b/release/src/main/Dockerfile @@ -51,8 +51,8 @@ RUN curl https://pyenv.run | bash && \ # Install a Go version >= 1.16 so we can bootstrap higher # Go versions -RUN wget https://golang.org/dl/go1.17.linux-amd64.tar.gz && \ - tar -zxvf go1.17.linux-amd64.tar.gz -C /usr/local/ && \ +RUN wget https://golang.org/dl/go1.23.1.linux-amd64.tar.gz && \ + tar -zxvf go1.23.1.linux-amd64.tar.gz -C /usr/local/ && \ echo "export PATH=/usr/local/go/bin:${PATH}" | tee /etc/profile.d/go.sh && \ chmod a+x "/etc/profile.d/go.sh" && \ source "/etc/profile.d/go.sh" From 0792d666bdeb995c8783f01908b1c76f3ecb2e7f Mon Sep 17 00:00:00 2001 From: lostluck <13907733+lostluck@users.noreply.github.com> Date: Thu, 26 Sep 2024 14:00:19 -0700 Subject: [PATCH 3/3] update CHANGES.md with this note --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index c123a8e1a4dc..e79fd3103d05 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -64,6 +64,9 @@ * Dataflow worker can install packages from Google Artifact Registry Python repositories (Python) ([#32123](https://github.com/apache/beam/issues/32123)). * Added support for Zstd codec in SerializableAvroCodecFactory (Java) ([#32349](https://github.com/apache/beam/issues/32349)) * Added support for using vLLM in the RunInference transform (Python) ([#32528](https://github.com/apache/beam/issues/32528)) +* Prism release binaries and container bootloaders are now being built with the latest Go 1.23 patch. ([#32575](https://github.com/apache/beam/pull/32575)) +* Prism + * Prism now supports Bundle Finalization. ([#32425](https://github.com/apache/beam/pull/32425)) ## Breaking Changes