From 3f4c50677b7e7881a5f9081c1a07ac9c0f088f9a Mon Sep 17 00:00:00 2001
From: 1gtm <1gtm@appscode.com>
Date: Fri, 15 Aug 2025 04:56:06 +0000
Subject: [PATCH] Use Go 1.25

/cherry-pick

Signed-off-by: 1gtm <1gtm@appscode.com>
---
 .github/workflows/ci.yml | 4 ++--
 Dockerfile.dbg           | 2 +-
 Makefile                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 85eba7f1..845631ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,10 +20,10 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
 
-      - name: Set up Go 1.24
+      - name: Set up Go 1.25
         uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: '1.25'
         id: go
 
       - uses: actions/checkout@v4
diff --git a/Dockerfile.dbg b/Dockerfile.dbg
index 7184b334..47f6a691 100644
--- a/Dockerfile.dbg
+++ b/Dockerfile.dbg
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ghcr.io/appscode/dlv:1.24
+FROM ghcr.io/appscode/dlv:1.25
 
 FROM {ARG_FROM}
 
diff --git a/Makefile b/Makefile
index 263c0a79..683d6196 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ TAG              := $(VERSION)_$(OS)_$(ARCH)
 TAG_PROD         := $(TAG)
 TAG_DBG          := $(VERSION)-dbg_$(OS)_$(ARCH)
 
-GO_VERSION       ?= 1.24
+GO_VERSION       ?= 1.25
 BUILD_IMAGE      ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
 
 OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)