Skip to content

Commit 4d05650

Browse files
committed
ci: make go 1.25 the min required version
some of the dependencies (e.g. lipgloss) require 1.25 and that's what we specified in go.mod but hadn't updated the CI and nix flake.
1 parent 91a5d76 commit 4d05650

File tree

4 files changed

+23
-22
lines changed

4 files changed

+23
-22
lines changed

.github/workflows/go.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,31 @@ on:
55
pull_request:
66
branches: ["main"]
77
jobs:
8-
test:
9-
strategy:
10-
matrix:
11-
platform: [ubuntu-latest, macos-latest]
12-
runs-on: ${{ matrix.platform }}
13-
steps:
14-
- uses: actions/checkout@v4
15-
- name: Set up Go
16-
uses: actions/setup-go@v5
17-
with:
18-
go-version: '1.24'
19-
- name: Test
20-
run: go test -v ./...
218
lint:
229
runs-on: ubuntu-latest
2310
steps:
24-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v6
2512
- name: Set up Go
26-
uses: actions/setup-go@v5
13+
uses: actions/setup-go@v6
2714
with:
28-
go-version: '1.24'
15+
go-version: '1.25.0'
2916
- name: Check if `go fmt` and `go mod tidy` make any changes
3017
run: |
3118
set -x
3219
go fmt ./...
3320
go mod tidy
3421
git diff --exit-code
22+
test:
23+
strategy:
24+
matrix:
25+
platform: [ubuntu-latest, macos-latest]
26+
runs-on: ${{ matrix.platform }}
27+
needs: lint
28+
steps:
29+
- uses: actions/checkout@v6
30+
- name: Set up Go
31+
uses: actions/setup-go@v6
32+
with:
33+
go-version: '1.25.0'
34+
- name: Test
35+
run: go test -v ./...

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
runs-on: ubuntu-22.04
2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424
- name: Set up Go
25-
uses: actions/setup-go@v5
25+
uses: actions/setup-go@v6
2626
with:
27-
go-version: "1.24"
27+
go-version: "1.25.0"
2828
- name: Get release version
2929
id: get_version
3030
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT

nix/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
lib,
3-
buildGoModule,
3+
buildGo125Module,
44
version ? "dev",
55
}:
66

7-
buildGoModule {
7+
buildGo125Module {
88
inherit version;
99
pname = "jjui";
1010

nix/shells.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
name = "jjui-dev";
77
buildInputs = with pkgs; [
88
# Go toolchain
9-
go
9+
go_1_25
1010
gotools
1111

1212
jujutsu

0 commit comments

Comments
 (0)