From 81c2d5069fe60ede2be314861bd9291bc3e2ddd5 Mon Sep 17 00:00:00 2001
From: Blake Gentry <blakesgentry@gmail.com>
Date: Wed, 11 Feb 2026 11:27:55 -0600
Subject: [PATCH 1/2] use Go v1.25 and 1.26

Continue our policy of supporting the latest Go major release and the
previous one.
---
 .github/workflows/ci.yaml                  | 8 ++++----
 .github/workflows/package-and-release.yaml | 2 +-
 CHANGELOG.md                               | 4 ++++
 go.mod                                     | 4 ++--
 packager/go.mod                            | 4 ++--
 riverproui/go.mod                          | 4 ++--
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f6b5635a..7984b0ba 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,8 +19,8 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - "1.24"
           - "1.25"
+          - "1.26"
         postgres-version: [18, 17, 16]
       fail-fast: false
     timeout-minutes: 5
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Go ${{ matrix.go-version }}
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ matrix.go-version }}
 
@@ -101,7 +101,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           check-latest: true
           go-version-file: "./go.mod"
@@ -221,7 +221,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           check-latest: true
           go-version-file: "go.mod"
diff --git a/.github/workflows/package-and-release.yaml b/.github/workflows/package-and-release.yaml
index b8b37f66..e310ccff 100644
--- a/.github/workflows/package-and-release.yaml
+++ b/.github/workflows/package-and-release.yaml
@@ -70,7 +70,7 @@ jobs:
         run: npm exec vite build -- --sourcemap false
 
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           check-latest: true
           go-version-file: "packager/go.mod"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a90ab182..9b7b1ab9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Upgrade supported Go versions to 1.25 and 1.26, and update CI accordingly. [PR #508](https://github.com/riverqueue/riverui/pull/508).
+
 ### Fixed
 
 - Prevent double slash in URLs for root path prefix. Thanks [Jan Kott](https://github.com/boostvolt)! [PR #487](https://github.com/riverqueue/riverui/pull/487).
diff --git a/go.mod b/go.mod
index 3fbd1ef3..71433c73 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
 module riverqueue.com/riverui
 
-go 1.24.0
+go 1.25.0
 
-toolchain go1.24.4
+toolchain go1.25.7
 
 require (
 	github.com/jackc/pgx/v5 v5.8.0
diff --git a/packager/go.mod b/packager/go.mod
index f09e8c8b..3dffdf48 100644
--- a/packager/go.mod
+++ b/packager/go.mod
@@ -1,7 +1,7 @@
 module riverqueue.com/riverqueue/packager
 
-go 1.24.0
+go 1.25.0
 
-toolchain go1.24.4
+toolchain go1.25.7
 
 require golang.org/x/mod v0.33.0
diff --git a/riverproui/go.mod b/riverproui/go.mod
index d0776c1f..ee9b320b 100644
--- a/riverproui/go.mod
+++ b/riverproui/go.mod
@@ -1,8 +1,8 @@
 module riverqueue.com/riverui/riverproui
 
-go 1.24.0
+go 1.25.0
 
-toolchain go1.24.4
+toolchain go1.25.7
 
 require (
 	github.com/google/uuid v1.6.0

From 0ea20d485b8b7840e6f2e09c12fc3c9790c0fc2c Mon Sep 17 00:00:00 2001
From: Blake Gentry <blakesgentry@gmail.com>
Date: Fri, 13 Feb 2026 09:24:54 -0600
Subject: [PATCH 2/2] use golangci-lint v2.9.0, actions v9

---
 .github/workflows/ci.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7984b0ba..de1cf5b1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -90,7 +90,7 @@ jobs:
     name: Go lint
     runs-on: ubuntu-latest
     env:
-      GOLANGCI_LINT_VERSION: v2.7.2
+      GOLANGCI_LINT_VERSION: v2.9.0
       GOPROXY: https://proxy.golang.org,https://u:${{ secrets.RIVERPRO_GO_MOD_CREDENTIAL }}@riverqueue.com/goproxy,direct
     permissions:
       contents: read
@@ -112,7 +112,7 @@ jobs:
         run: make fake_assets
 
       - name: Lint
-        uses: golangci/golangci-lint-action@v7
+        uses: golangci/golangci-lint-action@v9
         with:
           # golangci-lint needs to be run separately for every Go module, and
           # its GitHub Action doesn't provide any way to do that. Have it fetch