From dc10b77ce00055fe48a408f213187182111aff9e Mon Sep 17 00:00:00 2001
From: Jack McCluskey <34928439+jrmccluskey@users.noreply.github.com>
Date: Tue, 9 Jul 2024 13:59:33 -0400
Subject: [PATCH] Update Go Version to 1.22.5 (#31812)

---
 .github/gh-actions-self-hosted-runners/arc/images/Dockerfile    | 2 +-
 .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy  | 2 +-
 dev-support/docker/Dockerfile                                   | 2 +-
 sdks/go/run_with_go_version.sh                                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile
index 7fa8f631729c..3737492f6179 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.4
+ARG go_version=1.22.5
 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/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index ba6279a13490..616a198cb845 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -2223,7 +2223,7 @@ class BeamModulePlugin implements Plugin<Project> {
 
       // 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.4"
+      project.ext.goVersion = "go1.22.5"
 
       // 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 5cabba8be41a..d7887561b710 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.4
+ENV DOWNLOAD_GO_VERSION=1.22.5
 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 7de5f339011d..2e542821969c 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.4
+GOVERS=go1.22.5
 
 if ! command -v go &> /dev/null
 then