Skip to content

Commit 1a37125

Browse files
jmattheisjmattheis
authored
Merge pull request #84 from gotify/update
Update
2 parents cfd2536 + 7f92b36 commit 1a37125

7 files changed

Lines changed: 149 additions & 117 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +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@v7
12+
- uses: actions/setup-go@v7
1313
with:
14-
go-version: 1.24.x
15-
stable: true
14+
go-version: 1.26.x
1615

1716
- run: go get -v -t -d ./...
1817
- run: make VERSION=${GITHUB_REF/refs\/tags\/v/} clean build
@@ -36,20 +35,20 @@ jobs:
3635
id-token: write
3736

3837
steps:
39-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v7
4039

4140
- if: startsWith(github.ref, 'refs/tags/v')
4241
run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
4342
- run: echo "DOCKER_BUILD_PUSH=true" >> $GITHUB_ENV
4443

45-
- uses: docker/setup-buildx-action@v3
46-
- uses: docker/setup-qemu-action@v3
47-
- uses: docker/login-action@v3
44+
- uses: docker/setup-buildx-action@v4
45+
- uses: docker/setup-qemu-action@v4
46+
- uses: docker/login-action@v4
4847
with:
4948
registry: docker.io
5049
username: ${{ secrets.DOCKER_USER }}
5150
password: ${{ secrets.DOCKER_PASS }}
52-
- uses: docker/login-action@v3
51+
- uses: docker/login-action@v4
5352
with:
5453
registry: ghcr.io
5554
username: ${{ github.actor }}

‎.github/workflows/check.yml‎

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

1312
- name: Check out code into the Go module directory
14-
uses: actions/checkout@v4
13+
uses: actions/checkout@v7
1514

1615
- name: Get dependencies
1716
run: go get -v -t -d ./...
@@ -21,7 +20,7 @@ jobs:
2120
image:
2221
runs-on: ubuntu-latest
2322
steps:
24-
- uses: actions/checkout@v4
25-
- uses: docker/setup-buildx-action@v3
23+
- uses: actions/checkout@v7
24+
- uses: docker/setup-buildx-action@v4
2625
- run: |
2726
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 \

‎command/initialize.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,6 @@ func inputRawToken(gotify *api.GotifyREST) string {
178178
for {
179179
enteredToken := inputString("Application Token: ")
180180

181-
if len(enteredToken) != 15 {
182-
fmt.Println("A application token must have a length of 15 characters")
183-
hr()
184-
continue
185-
}
186181
_, err := utils.SpinLoader("Validating", func(success chan interface{}, failure chan error) {
187182
params := message.NewCreateMessageParams()
188183
params.Body = &models.MessageExternal{

‎command/watch.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func doWatch(ctx *cli.Context) {
134134
fmt.Fprint(msgData, output)
135135
fmt.Fprintln(msgData, "== END NEW OUTPUT ==")
136136
case "short":
137-
fmt.Fprintf(msgData, output)
137+
fmt.Fprint(msgData, output)
138138
}
139139

140140
msgString := msgData.String()

‎go.mod‎

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,54 @@
11
module github.com/gotify/cli/v2
22

3-
go 1.23
3+
go 1.25.0
44

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

77
require (
8-
github.com/adrg/xdg v0.4.0
9-
github.com/go-openapi/runtime v0.28.0
8+
github.com/adrg/xdg v0.5.3
9+
github.com/go-openapi/runtime v0.32.5
1010
github.com/gotify/go-api-client/v2 v2.0.4
1111
github.com/tj/go-spin v1.1.0
12-
golang.org/x/crypto v0.24.0
12+
golang.org/x/crypto v0.54.0
1313
gopkg.in/urfave/cli.v1 v1.20.0
1414
)
1515

1616
require (
17-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
18-
github.com/go-logr/logr v1.4.1 // indirect
17+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
18+
github.com/go-logr/logr v1.4.3 // indirect
1919
github.com/go-logr/stdr v1.2.2 // indirect
20-
github.com/go-openapi/analysis v0.23.0 // indirect
21-
github.com/go-openapi/errors v0.22.0 // indirect
22-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
23-
github.com/go-openapi/jsonreference v0.21.0 // indirect
24-
github.com/go-openapi/loads v0.22.0 // indirect
25-
github.com/go-openapi/spec v0.21.0 // indirect
26-
github.com/go-openapi/strfmt v0.23.0 // indirect
27-
github.com/go-openapi/swag v0.23.0 // indirect
28-
github.com/go-openapi/validate v0.24.0 // indirect
20+
github.com/go-openapi/analysis v0.25.3 // indirect
21+
github.com/go-openapi/errors v0.22.8 // indirect
22+
github.com/go-openapi/jsonpointer v1.0.0 // indirect
23+
github.com/go-openapi/jsonreference v1.0.0 // indirect
24+
github.com/go-openapi/loads v0.24.0 // indirect
25+
github.com/go-openapi/runtime/server-middleware v0.32.5 // indirect
26+
github.com/go-openapi/spec v0.22.6 // indirect
27+
github.com/go-openapi/strfmt v0.27.0 // indirect
28+
github.com/go-openapi/swag v0.27.0 // indirect
29+
github.com/go-openapi/swag/cmdutils v0.27.0 // indirect
30+
github.com/go-openapi/swag/conv v0.27.0 // indirect
31+
github.com/go-openapi/swag/fileutils v0.27.0 // indirect
32+
github.com/go-openapi/swag/jsonname v0.27.0 // indirect
33+
github.com/go-openapi/swag/jsonutils v0.27.0 // indirect
34+
github.com/go-openapi/swag/loading v0.27.0 // indirect
35+
github.com/go-openapi/swag/mangling v0.27.0 // indirect
36+
github.com/go-openapi/swag/netutils v0.27.0 // indirect
37+
github.com/go-openapi/swag/stringutils v0.27.0 // indirect
38+
github.com/go-openapi/swag/typeutils v0.27.0 // indirect
39+
github.com/go-openapi/swag/yamlutils v0.27.0 // indirect
40+
github.com/go-openapi/validate v0.26.0 // indirect
41+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
2942
github.com/google/uuid v1.6.0 // indirect
30-
github.com/josharian/intern v1.0.0 // indirect
31-
github.com/mailru/easyjson v0.7.7 // indirect
32-
github.com/mitchellh/mapstructure v1.5.0 // indirect
33-
github.com/oklog/ulid v1.3.1 // indirect
34-
github.com/opentracing/opentracing-go v1.2.0 // indirect
35-
go.mongodb.org/mongo-driver v1.14.0 // indirect
36-
go.opentelemetry.io/otel v1.24.0 // indirect
37-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
38-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
39-
golang.org/x/sync v0.6.0 // indirect
40-
golang.org/x/sys v0.21.0 // indirect
41-
golang.org/x/term v0.21.0 // indirect
42-
gopkg.in/yaml.v3 v3.0.1 // indirect
43+
github.com/oklog/ulid/v2 v2.1.1 // indirect
44+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
45+
go.opentelemetry.io/otel v1.44.0 // indirect
46+
go.opentelemetry.io/otel/metric v1.44.0 // indirect
47+
go.opentelemetry.io/otel/trace v1.44.0 // indirect
48+
go.yaml.in/yaml/v3 v3.0.4 // indirect
49+
golang.org/x/net v0.57.0 // indirect
50+
golang.org/x/sync v0.22.0 // indirect
51+
golang.org/x/sys v0.47.0 // indirect
52+
golang.org/x/term v0.45.0 // indirect
53+
golang.org/x/text v0.40.0 // indirect
4354
)

0 commit comments

Comments
 (0)