diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index f077958..4d42b14 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -5,30 +5,31 @@ on: pull_request: branches: ["main"] jobs: - test: - strategy: - matrix: - platform: [ubuntu-latest, macos-latest] - runs-on: ${{ matrix.platform }} - steps: - - uses: actions/checkout@v4 - - name: Set up Go - uses: actions/setup-go@v5 - with: - go-version: '1.24' - - name: Test - run: go test -v ./... lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: - go-version: '1.24' + go-version: '1.25.0' - name: Check if `go fmt` and `go mod tidy` make any changes run: | set -x go fmt ./... go mod tidy git diff --exit-code + test: + strategy: + matrix: + platform: [ubuntu-latest, macos-latest] + runs-on: ${{ matrix.platform }} + needs: lint + steps: + - uses: actions/checkout@v6 + - name: Set up Go + uses: actions/setup-go@v6 + with: + go-version: '1.25.0' + - name: Test + run: go test -v ./... diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5fa6f87..1f3921c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,11 +20,11 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Set up Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: - go-version: "1.24" + go-version: "1.25.0" - name: Get release version id: get_version run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT diff --git a/nix/package.nix b/nix/package.nix index 3d31a9a..adacd6f 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,10 +1,10 @@ { lib, - buildGoModule, + buildGo125Module, version ? "dev", }: -buildGoModule { +buildGo125Module { inherit version; pname = "jjui"; diff --git a/nix/shells.nix b/nix/shells.nix index 936334a..5efaf81 100644 --- a/nix/shells.nix +++ b/nix/shells.nix @@ -6,7 +6,7 @@ name = "jjui-dev"; buildInputs = with pkgs; [ # Go toolchain - go + go_1_25 gotools jujutsu