From 47b1ededf347d5aa6b733d7727b85f88faabd23b Mon Sep 17 00:00:00 2001
From: kyu08 <49891479+kyu08@users.noreply.github.com>
Date: Sun, 21 Sep 2025 22:06:24 +0900
Subject: [PATCH 1/2] Bump golangci-lint to v.2.4.0 from v2.2.1

---
 .github/workflows/ci.yml      | 2 +-
 scripts/golangci-lint-shim.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7f69523ba..2ca93cf6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -171,7 +171,7 @@ jobs:
         uses: golangci/golangci-lint-action@v8
         with:
           # If you change this, make sure to also update scripts/golangci-lint-shim.sh
-          version: v2.2.1
+          version: v2.4.0
       - name: errors
         run: golangci-lint run
         if: ${{ failure() }}
diff --git a/scripts/golangci-lint-shim.sh b/scripts/golangci-lint-shim.sh
index 24e32ac85..a85ccc4d7 100755
--- a/scripts/golangci-lint-shim.sh
+++ b/scripts/golangci-lint-shim.sh
@@ -3,6 +3,6 @@
 set -e
 
 # Must be kept in sync with the version in .github/workflows/ci.yml
-version="v2.2.1"
+version="v2.4.0"
 
 go run "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$version" "$@"

From 93b8d70209cbf29ca061f104556431dc4da301f3 Mon Sep 17 00:00:00 2001
From: kyu08 <49891479+kyu08@users.noreply.github.com>
Date: Sat, 23 Aug 2025 12:05:31 +0900
Subject: [PATCH 2/2] Update go to 1.25

---
 .github/workflows/ci.yml      | 14 +++++++-------
 .github/workflows/release.yml |  2 +-
 .golangci.yml                 |  2 +-
 Dockerfile                    |  2 +-
 go.mod                        |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2ca93cf6a..a7612deb7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 name: Continuous Integration
 
 env:
-  GO_VERSION: 1.24
+  GO_VERSION: 1.25
 
 on:
   push:
@@ -32,7 +32,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
       - name: Test code
         # we're passing -short so that we skip the integration tests, which will be run in parallel below
         run: |
@@ -87,7 +87,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
       - name: Print git version
         run: git --version
       - name: Test code
@@ -113,7 +113,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
       - name: Build linux binary
         run: |
           GOOS=linux go build
@@ -140,7 +140,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
       - name: Check Vendor Directory
         # ensure our vendor directory matches up with our go modules
         run: |
@@ -166,7 +166,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
       - name: Lint
         uses: golangci/golangci-lint-action@v8
         with:
@@ -187,7 +187,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
 
       - name: Download all coverage artifacts
         uses: actions/download-artifact@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index abf81551f..4eb2a5a20 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -139,7 +139,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
 
       - name: Run goreleaser
         uses: goreleaser/goreleaser-action@v6
diff --git a/.golangci.yml b/.golangci.yml
index b217d78a0..c13f7b9f3 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,6 +1,6 @@
 version: "2"
 run:
-  go: "1.24"
+  go: "1.25"
 linters:
   enable:
     - copyloopvar
diff --git a/Dockerfile b/Dockerfile
index 796787a6d..8a18ad8d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # docker build -t lazygit .
 # docker run -it lazygit:latest /bin/sh
 
-FROM golang:1.24 as build
+FROM golang:1.25 as build
 WORKDIR /go/src/github.com/jesseduffield/lazygit/
 COPY go.mod go.sum ./
 RUN go mod download
diff --git a/go.mod b/go.mod
index d26fb1cff..a425a2797 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/jesseduffield/lazygit
 
-go 1.24.0
+go 1.25.0
 
 require (
 	dario.cat/mergo v1.0.1