Skip to content

Commit 8886513

Browse files
committed
fix: update actions & upgrade to go1.25
1 parent cfd2536 commit 8886513

4 files changed

Lines changed: 10 additions & 14 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v4
12-
- uses: actions/setup-go@v5
11+
- uses: actions/checkout@v5
12+
- uses: actions/setup-go@v6
1313
with:
14-
go-version: 1.24.x
14+
go-version: 1.25.x
1515
stable: true
1616

1717
- run: go get -v -t -d ./...
@@ -36,7 +36,7 @@ jobs:
3636
id-token: write
3737

3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v5
4040

4141
- if: startsWith(github.ref, 'refs/tags/v')
4242
run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV

.github/workflows/check.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Setup Go environment
8-
uses: actions/setup-go@v5
8+
uses: actions/setup-go@v6
99
with:
10-
go-version: 1.24.x
10+
go-version: 1.25.x
1111
stable: true
1212

1313
- name: Check out code into the Go module directory
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
- name: Get dependencies
1717
run: go get -v -t -d ./...
@@ -21,7 +21,7 @@ jobs:
2121
image:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- uses: docker/setup-buildx-action@v3
2626
- run: |
2727
make PLATFORM=linux/amd64 build-docker-multiarch

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ LD_FLAGS ?= $(if $(VERSION),-X main.Version=${VERSION}) \
1818
-X main.BuildDate=$(shell date "+%F-%T") \
1919
-X main.Commit=${COMMIT}
2020

21-
ifdef GOTOOLCHAIN
22-
GO_VERSION=$(GOTOOLCHAIN)
23-
else
24-
GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//')
25-
endif
21+
GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//')
2622

2723
build-docker-multiarch:
2824
docker buildx build \

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/gotify/cli/v2
22

33
go 1.23
44

5-
toolchain go1.24.1
5+
toolchain go1.25.1
66

77
require (
88
github.com/adrg/xdg v0.4.0

0 commit comments

Comments
 (0)