From 0885eb8f1c8fb7694876b8495e4fe8de8a4b2764 Mon Sep 17 00:00:00 2001
From: Joe Chen <jc@unknwon.io>
Date: Tue, 1 Apr 2025 21:55:24 -0400
Subject: [PATCH] Go 1.24

---
 .github/workflows/go.yml | 12 ++++++------
 CHANGELOG.md             |  2 +-
 go.mod                   |  5 ++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 7bd262f01..599a3019a 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.24.x
       - name: Install Task
         uses: arduino/setup-task@v2
         with:
@@ -61,7 +61,7 @@ jobs:
     name: Test
     strategy:
       matrix:
-        go-version: [ 1.23.x ]
+        go-version: [ 1.24.x ]
         platform: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -101,7 +101,7 @@ jobs:
     name: Test Windows
     strategy:
       matrix:
-        go-version: [ 1.23.x ]
+        go-version: [ 1.24.x ]
         platform: [ windows-latest ]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -139,7 +139,7 @@ jobs:
     name: Postgres
     strategy:
       matrix:
-        go-version: [ 1.23.x ]
+        go-version: [ 1.24.x ]
         platform: [ ubuntu-latest ]
     runs-on: ${{ matrix.platform }}
     services:
@@ -175,7 +175,7 @@ jobs:
     name: MySQL
     strategy:
       matrix:
-        go-version: [ 1.23.x ]
+        go-version: [ 1.24.x ]
         platform: [ ubuntu-20.04 ]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -200,7 +200,7 @@ jobs:
     name: SQLite - Go
     strategy:
       matrix:
-        go-version: [ 1.23.x ]
+        go-version: [ 1.24.x ]
         platform: [ ubuntu-latest ]
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index beb125a74..2d59ea645 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ All notable changes to Gogs are documented in this file.
 
 ### Changed
 
-- The required Go version to compile source code changed to 1.23.4.
+- The required Go version to compile source code changed to 1.24.
 - The build tag `cert` has been removed, and the `gogs cert` subcommand is now always available. [#7883](https://github.com/gogs/gogs/pull/7883)
 
 ### Fixed
diff --git a/go.mod b/go.mod
index f8c1872af..20ac4cf2a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,6 @@
 module gogs.io/gogs
 
-go 1.23.4
-toolchain go1.24.1
+go 1.24
 
 require (
 	github.com/Masterminds/semver/v3 v3.3.1
@@ -136,5 +135,5 @@ require (
 	modernc.org/memory v1.9.1 // indirect
 )
 
-// +heroku goVersion go1.23
+// +heroku goVersion go1.24
 // +heroku install ./