Skip to content

Commit 69c939e

Browse files
authored
Merge pull request #661 from gotify/update-backend
Update backend dependencies
2 parents 12c7164 + 5141736 commit 69c939e

File tree

5 files changed

+81
-123
lines changed

5 files changed

+81
-123
lines changed

.github/workflows/build.yml

+8-18
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,16 @@ jobs:
55
gotify:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/setup-go@v2
8+
- uses: actions/setup-go@v5
99
with:
10-
go-version: 1.21.x
11-
- uses: actions/setup-node@v1
10+
go-version: 1.22.x
11+
- uses: actions/setup-node@v4
1212
with:
1313
node-version: '20'
14-
- uses: actions/cache@v2
15-
with:
16-
path: ~/go/pkg/mod
17-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
18-
restore-keys: |
19-
${{ runner.os }}-go-
20-
- uses: actions/cache@v2
21-
with:
22-
path: |
23-
ui/node_modules
24-
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}
25-
restore-keys: ${{ runner.os }}-node_modules-
26-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
2715
- run: (cd ui && yarn)
2816
- run: make build-js
29-
- uses: golangci/golangci-lint-action@v3
17+
- uses: golangci/golangci-lint-action@v5
3018
with:
3119
version: v1.55
3220
args: --timeout=5m
@@ -35,7 +23,9 @@ jobs:
3523
- run: make download-tools
3624
- run: make test
3725
- run: make check-ci
38-
- uses: codecov/codecov-action@v1
26+
- uses: codecov/codecov-action@v4
27+
with:
28+
token: ${{ secrets.CODECOV_TOKEN }}
3929
- if: startsWith(github.ref, 'refs/tags/v')
4030
run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
4131
- if: startsWith(github.ref, 'refs/tags/v')

GO_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.21.1
1+
1.22.4

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ check-js:
3636
(cd ui && yarn testformat)
3737

3838
download-tools:
39-
go install github.com/go-swagger/go-swagger/cmd/swagger@v0.30.5
39+
go install github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0
4040

4141
update-swagger:
4242
swagger generate spec --scan-models -o docs/spec.json

go.mod

+23-20
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@ module github.com/gotify/server/v2
22

33
require (
44
github.com/fortytw2/leaktest v1.3.0
5-
github.com/gin-contrib/cors v1.4.0
6-
github.com/gin-contrib/gzip v0.0.6
7-
github.com/gin-gonic/gin v1.9.1
8-
github.com/go-playground/validator/v10 v10.15.4
9-
github.com/gorilla/websocket v1.5.0
5+
github.com/gin-contrib/cors v1.7.2
6+
github.com/gin-contrib/gzip v1.0.1
7+
github.com/gin-gonic/gin v1.10.0
8+
github.com/go-playground/validator/v10 v10.22.0
9+
github.com/gorilla/websocket v1.5.3
1010
github.com/gotify/configor v1.0.2
1111
github.com/gotify/location v0.0.0-20170722210143-03bc4ad20437
1212
github.com/gotify/plugin-api v1.0.0
1313
github.com/h2non/filetype v1.1.3
1414
github.com/jinzhu/gorm v1.9.16
1515
github.com/robfig/cron v1.2.0
16-
github.com/stretchr/testify v1.8.4
17-
golang.org/x/crypto v0.13.0
16+
github.com/stretchr/testify v1.9.0
17+
golang.org/x/crypto v0.24.0
1818
gopkg.in/yaml.v2 v2.4.0
1919
)
2020

2121
require (
2222
github.com/BurntSushi/toml v0.3.1 // indirect
23-
github.com/bytedance/sonic v1.9.1 // indirect
24-
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
23+
github.com/bytedance/sonic v1.11.6 // indirect
24+
github.com/bytedance/sonic/loader v0.1.1 // indirect
25+
github.com/cloudwego/base64x v0.1.4 // indirect
26+
github.com/cloudwego/iasm v0.2.0 // indirect
2527
github.com/davecgh/go-spew v1.1.1 // indirect
26-
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
28+
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
2729
github.com/gin-contrib/sse v0.1.0 // indirect
2830
github.com/go-playground/locales v0.14.1 // indirect
2931
github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -32,23 +34,24 @@ require (
3234
github.com/goccy/go-json v0.10.2 // indirect
3335
github.com/jinzhu/inflection v1.0.0 // indirect
3436
github.com/json-iterator/go v1.1.12 // indirect
35-
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
36-
github.com/leodido/go-urn v1.2.4 // indirect
37+
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
38+
github.com/kr/text v0.2.0 // indirect
39+
github.com/leodido/go-urn v1.4.0 // indirect
3740
github.com/lib/pq v1.10.0 // indirect
38-
github.com/mattn/go-isatty v0.0.19 // indirect
41+
github.com/mattn/go-isatty v0.0.20 // indirect
3942
github.com/mattn/go-sqlite3 v1.14.7 // indirect
4043
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4144
github.com/modern-go/reflect2 v1.0.2 // indirect
42-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
45+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
4346
github.com/pkg/errors v0.9.1 // indirect
4447
github.com/pmezard/go-difflib v1.0.0 // indirect
4548
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
46-
github.com/ugorji/go/codec v1.2.11 // indirect
47-
golang.org/x/arch v0.3.0 // indirect
48-
golang.org/x/net v0.10.0 // indirect
49-
golang.org/x/sys v0.12.0 // indirect
50-
golang.org/x/text v0.13.0 // indirect
51-
google.golang.org/protobuf v1.30.0 // indirect
49+
github.com/ugorji/go/codec v1.2.12 // indirect
50+
golang.org/x/arch v0.8.0 // indirect
51+
golang.org/x/net v0.25.0 // indirect
52+
golang.org/x/sys v0.21.0 // indirect
53+
golang.org/x/text v0.16.0 // indirect
54+
google.golang.org/protobuf v1.34.1 // indirect
5255
gopkg.in/yaml.v3 v3.0.1 // indirect
5356
)
5457

0 commit comments

Comments
 (0)