Skip to content

Commit

Permalink
Add Go 1.23 to build matrix + update toolchain (#533)
Browse files Browse the repository at this point in the history
Add Go 1.23 to the build matrix and update toolchain in `go.work` and
all `go.mod` files. Add development instructions for how to use the new
`make update-mod-go` to do so in an automated way.

I didn't drop Go 1.21 support yet because I figure there isn't a hurry
in jettisoning it immediately, although, we'll have to see how the build
stability is with the expanded matrix.
  • Loading branch information
brandur authored Aug 18, 2024
1 parent 3eda791 commit 3cc1498
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
go-version:
- "1.21"
- "1.22"
- "1.23"
postgres-version: [14, 15, 16]
fail-fast: false
timeout-minutes: 5
Expand Down
2 changes: 1 addition & 1 deletion cmd/river/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/riverqueue/river/cmd/river

go 1.21

toolchain go1.22.5
toolchain go1.23.0

require (
github.com/jackc/pgx/v5 v5.6.0
Expand Down
8 changes: 8 additions & 0 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,11 @@ If updates to River dependencies _are_ required, then a second phase of the rele
```

The main `$VERSION` tag and `cmd/river/$VERSION` will point to different commits, and although a little odd, is tolerable.

### Updating Go or toolchain versions in all `go.mod` files

Modify `go.work` so it contains the new desired version in `go` and/or `toolchain` directives, then run `make update-mod-go` to have it reflect the new version(s) into all the workspace's `go.mod` files:
```shell
make update-mod-go
```
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/riverqueue/river

go 1.21

toolchain go1.22.5
toolchain go1.23.0

require (
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa
Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
go 1.21

toolchain go1.22.5
toolchain go1.23.0

use (
.
Expand Down
2 changes: 1 addition & 1 deletion riverdriver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ module github.com/riverqueue/river/riverdriver

go 1.21

toolchain go1.22.5
toolchain go1.23.0

require github.com/riverqueue/river/rivertype v0.11.2
2 changes: 1 addition & 1 deletion riverdriver/riverdatabasesql/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/riverqueue/river/riverdriver/riverdatabasesql

go 1.21

toolchain go1.22.5
toolchain go1.23.0

require (
github.com/lib/pq v1.10.9
Expand Down
2 changes: 1 addition & 1 deletion riverdriver/riverpgxv5/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/riverqueue/river/riverdriver/riverpgxv5

go 1.21

toolchain go1.22.5
toolchain go1.23.0

require (
github.com/jackc/pgx/v5 v5.5.0
Expand Down
2 changes: 1 addition & 1 deletion rivershared/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/riverqueue/river/rivershared

go 1.21

toolchain go1.22.5
toolchain go1.23.0

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion rivertype/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/riverqueue/river/rivertype

go 1.21

toolchain go1.22.5
toolchain go1.23.0

require github.com/stretchr/testify v1.9.0

Expand Down

0 comments on commit 3cc1498

Please sign in to comment.