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

/cherry-pick

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93281ea9..56fc0fad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,10 +13,10 @@ jobs:
     name: Build
     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/Makefile b/Makefile
index 9efcbf61..7b83affe 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,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)