Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}

Expand Down Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions packager/go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module riverqueue.com/riverqueue/packager

go 1.24.0
go 1.25.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a thought process to keeping the version in the go.mods one version behind? Should we just do 1.26 here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brandur ugh thought I posted this 2 days ago 🤦‍♂️

If you're asking for just the packager, this can be go 1.26.0. If you're asking for the other modules, this is the minimum required Go version, right? So making them 1.26.0 would make these releases incompatible with 1.25.0. At least I thought that's how this value works.


toolchain go1.24.4
toolchain go1.25.7

require golang.org/x/mod v0.33.0
4 changes: 2 additions & 2 deletions riverproui/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading