Skip to content

Commit 18b8d14

Browse files
committed
chore: prepare v6
Signed-off-by: Valery Piashchynski <piashchynski.valery@gmail.com>
1 parent 5d35c59 commit 18b8d14

7 files changed

Lines changed: 108 additions & 42 deletions

File tree

.github/dependabot.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,12 @@ updates:
99
directory: "/" # Location of package manifests
1010
schedule:
1111
interval: daily
12-
reviewers:
13-
- "rustatian"
1412
assignees:
1513
- "rustatian"
1614

1715
- package-ecosystem: "github-actions"
1816
directory: "/"
1917
schedule:
2018
interval: daily
21-
reviewers:
22-
- "rustatian"
23-
assignees:
24-
- "rustatian"
25-
26-
- package-ecosystem: "docker"
27-
directory: "/"
28-
schedule:
29-
interval: daily
30-
reviewers:
31-
- "rustatian"
3219
assignees:
3320
- "rustatian"

.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v6
3434
with:
3535
# We must fetch at least the immediate parents so that if this is
3636
# a pull request then we can checkout the head.
@@ -39,13 +39,13 @@ jobs:
3939
# Initializes the Golang environment for the CodeQL tools.
4040
# https://github.com/github/codeql-action/issues/1842#issuecomment-1704398087
4141
- name: Install Go
42-
uses: actions/setup-go@v5
42+
uses: actions/setup-go@v6
4343
with:
4444
go-version-file: go.mod
4545

4646
# Initializes the CodeQL tools for scanning.
4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@v3
48+
uses: github/codeql-action/init@v4
4949
with:
5050
languages: ${{ matrix.language }}
5151
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v3
59+
uses: github/codeql-action/autobuild@v4
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 https://git.io/JvXDl
@@ -70,4 +70,4 @@ jobs:
7070
# make release
7171

7272
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@v3
73+
uses: github/codeql-action/analyze@v4

.github/workflows/linters.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Check out code
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v6
1212

1313
- name: Set up Go
14-
uses: actions/setup-go@v5 # action page: <https://github.com/actions/setup-go>
14+
uses: actions/setup-go@v6 # action page: <https://github.com/actions/setup-go>
1515
with:
1616
go-version: stable
1717

1818
- name: Run linter
19-
uses: golangci/golangci-lint-action@v7 # Action page: <https://github.com/golangci/golangci-lint-action>
19+
uses: golangci/golangci-lint-action@v9 # Action page: <https://github.com/golangci/golangci-lint-action>
2020
with:
2121
only-new-issues: false # show only new issues if it's a pull request
22-
args: --timeout=10m --build-tags=race
22+
args: --timeout=10m --build-tags=race ./...

.github/workflows/linux.yml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: fileserver
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- stable
8+
pull_request:
9+
branches:
10+
- master
11+
- stable
12+
13+
jobs:
14+
fileserver_test:
15+
name: FileServer plugin (Go ${{ matrix.go }}, OS ${{ matrix.os }})
16+
runs-on: ${{ matrix.os }}
17+
timeout-minutes: 60
18+
strategy:
19+
matrix:
20+
go: [stable]
21+
os: ["ubuntu-latest"]
22+
steps:
23+
- name: Set up Go ${{ matrix.go }}
24+
uses: actions/setup-go@v6
25+
with:
26+
go-version: ${{ matrix.go }}
27+
28+
- name: Check out code
29+
uses: actions/checkout@v6
30+
31+
- name: Init Go modules Cache
32+
uses: actions/cache@v5
33+
with:
34+
path: ~/go/pkg/mod
35+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
36+
restore-keys: ${{ runner.os }}-go-
37+
38+
- name: Install Go dependencies
39+
run: go mod download
40+
41+
- name: Run golang tests with coverage
42+
run: |
43+
mkdir ./coverage-ci
44+
go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/roadrunner-server/fileserver/v6/... -coverprofile=./coverage-ci/fileserver.out -covermode=atomic ./...
45+
46+
- name: Archive code coverage results
47+
uses: actions/upload-artifact@v7
48+
with:
49+
name: coverage-fileserver
50+
path: ./coverage-ci
51+
52+
codecov:
53+
name: Upload codecov
54+
runs-on: ubuntu-latest
55+
needs:
56+
- fileserver_test
57+
timeout-minutes: 60
58+
steps:
59+
- name: Check out code
60+
uses: actions/checkout@v6
61+
62+
- name: Download code coverage results
63+
uses: actions/download-artifact@v8
64+
with:
65+
pattern: coverage-*
66+
path: coverage
67+
merge-multiple: true
68+
69+
- name: Merge and filter coverage files
70+
run: |
71+
echo 'mode: atomic' > summary.txt
72+
tail -q -n +2 coverage/*.out >> summary.txt
73+
awk '
74+
NR == 1 { print; next }
75+
/^github\.com\/roadrunner-server\/fileserver\/v6\// {
76+
sub(/^github\.com\/roadrunner-server\/fileserver\/v6\//, "", $0)
77+
print
78+
}
79+
' summary.txt > summary.filtered.txt
80+
mv summary.filtered.txt summary.txt
81+
82+
- name: upload to codecov
83+
uses: codecov/codecov-action@v5
84+
with:
85+
files: summary.txt
86+
fail_ci_if_error: false

.golangci.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ linters:
88
- bodyclose
99
- copyloopvar
1010
- dogsled
11-
- dupl
1211
- errcheck
1312
- errorlint
1413
- exhaustive
@@ -17,7 +16,6 @@ linters:
1716
- gocognit
1817
- goconst
1918
- gocritic
20-
- gocyclo
2119
- goprintffuncname
2220
- gosec
2321
- govet
@@ -35,13 +33,9 @@ linters:
3533
- unused
3634
- whitespace
3735
settings:
38-
dupl:
39-
threshold: 100
4036
goconst:
4137
min-len: 2
4238
min-occurrences: 3
43-
gocyclo:
44-
min-complexity: 15
4539
godot:
4640
scope: declarations
4741
capital: true
@@ -66,7 +60,6 @@ linters:
6660
- std-error-handling
6761
rules:
6862
- linters:
69-
- dupl
7063
- funlen
7164
- gocognit
7265
- scopelint

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
module github.com/roadrunner-server/fileserver/v5
1+
module github.com/roadrunner-server/fileserver/v6
22

33
go 1.26
44

55
toolchain go1.26.0
66

77
require (
8-
github.com/gofiber/fiber/v2 v2.52.11
8+
github.com/gofiber/fiber/v2 v2.52.12
99
github.com/roadrunner-server/errors v1.4.1
1010
github.com/roadrunner-server/tcplisten v1.5.2
1111
go.uber.org/zap v1.27.1
1212
)
1313

1414
require (
1515
github.com/andybalholm/brotli v1.2.0 // indirect
16-
github.com/clipperhouse/uax29/v2 v2.6.0 // indirect
16+
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
1717
github.com/google/uuid v1.6.0 // indirect
1818
github.com/klauspost/compress v1.18.4 // indirect
1919
github.com/mattn/go-colorable v0.1.14 // indirect
2020
github.com/mattn/go-isatty v0.0.20 // indirect
21-
github.com/mattn/go-runewidth v0.0.19 // indirect
21+
github.com/mattn/go-runewidth v0.0.21 // indirect
2222
github.com/stretchr/testify v1.9.0 // indirect
2323
github.com/valyala/bytebufferpool v1.0.0 // indirect
2424
github.com/valyala/fasthttp v1.69.0 // indirect
2525
go.uber.org/multierr v1.11.0 // indirect
26-
golang.org/x/sys v0.41.0 // indirect
26+
golang.org/x/sys v0.42.0 // indirect
2727
)

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
22
github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
3-
github.com/clipperhouse/uax29/v2 v2.6.0 h1:z0cDbUV+aPASdFb2/ndFnS9ts/WNXgTNNGFoKXuhpos=
4-
github.com/clipperhouse/uax29/v2 v2.6.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
3+
github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
4+
github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
55
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
66
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7-
github.com/gofiber/fiber/v2 v2.52.11 h1:5f4yzKLcBcF8ha1GQTWB+mpblWz3Vz6nSAbTL31HkWs=
8-
github.com/gofiber/fiber/v2 v2.52.11/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
7+
github.com/gofiber/fiber/v2 v2.52.12 h1:0LdToKclcPOj8PktUdIKo9BUohjjwfnQl42Dhw8/WUw=
8+
github.com/gofiber/fiber/v2 v2.52.12/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
99
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
1010
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
1111
github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c=
@@ -14,8 +14,8 @@ github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHP
1414
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
1515
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
1616
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
17-
github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
18-
github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
17+
github.com/mattn/go-runewidth v0.0.21 h1:jJKAZiQH+2mIinzCJIaIG9Be1+0NR+5sz/lYEEjdM8w=
18+
github.com/mattn/go-runewidth v0.0.21/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
1919
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2020
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2121
github.com/roadrunner-server/errors v1.4.1 h1:LKNeaCGiwd3t8IaL840ZNF3UA9yDQlpvHnKddnh0YRQ=
@@ -37,7 +37,7 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
3737
go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
3838
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
3939
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
40-
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
41-
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
40+
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
41+
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
4242
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
4343
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)