Skip to content

Commit 0152a04

Browse files
committed
feature: support v2024.2
Signed-off-by: Valery Piashchynski <piashchynski.valery@gmail.com>
1 parent 8911719 commit 0152a04

15 files changed

Lines changed: 182 additions & 65 deletions

File tree

‎.githooks/pre-commit‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
set -e -o pipefail
4+
5+
# https://github.com/koalaman/shellcheck/wiki/SC2039#redirect-both-stdout-and-stderr
6+
if ! command -v golangci-lint 2>&1 /dev/null; then
7+
echo "golangci-lint is not installed"
8+
exit 1
9+
fi
10+
11+
exec golangci-lint --build-tags=race run "$@"

‎.github/workflows/linters.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
- name: Run linter
1919
uses: golangci/golangci-lint-action@v6.0.1 # Action page: <https://github.com/golangci/golangci-lint-action>
2020
with:
21-
version: v1.56 # without patch version
21+
version: v1.59 # without patch version
2222
only-new-issues: false # show only new issues if it's a pull request
2323
args: --timeout=10m --build-tags=race

‎.github/workflows/linux.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
name: resetter
22

3-
on:
4-
push:
5-
branches:
6-
- master
7-
- stable
8-
pull_request:
9-
branches:
10-
- master
11-
- stable
3+
on: [push, pull_request]
124

135
jobs:
146
resetter_test:

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
# Dependency directories (remove the comment below to include it)
1515
# vendor/
1616
.idea
17-
.DS_Store
17+
.DS_Store
18+
**/composer.lock

‎.golangci.yml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,11 @@
22

33
run:
44
timeout: 1m
5-
skip-dirs:
6-
- .github
7-
- .git
85
allow-parallel-runners: true
96

10-
output:
11-
format: colored-line-number # colored-line-number|line-number|json|tab|checkstyle|code-climate
12-
137
linters-settings:
148
wsl:
159
allow-assign-and-anything: true
16-
govet:
17-
check-shadowing: true
18-
golint:
19-
min-confidence: 0.1
2010
gocyclo:
2111
min-complexity: 15
2212
godot:
@@ -36,7 +26,6 @@ linters-settings:
3626
range-loops: true
3727
for-loops: true
3828
nolintlint:
39-
allow-leading-space: false
4029
require-specific: true
4130

4231
linters: # All available linters list: <https://golangci-lint.run/usage/linters/>
@@ -76,6 +65,9 @@ linters: # All available linters list: <https://golangci-lint.run/usage/linters/
7665
- whitespace # Tool for detection of leading and trailing whitespace
7766

7867
issues:
68+
exclude-dirs:
69+
- .github
70+
- .git
7971
exclude-rules:
8072
- path: _test\.go
8173
linters:

‎githooks-installer.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
set -e
4+
5+
cp ./.githooks/pre-commit .git/hooks/pre-commit
6+
7+
echo "DONE"

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
module github.com/roadrunner-server/resetter/v4
1+
module github.com/roadrunner-server/resetter/v5
22

3-
go 1.22.4
3+
go 1.22.5
44

55
require (
66
github.com/roadrunner-server/endure/v2 v2.4.5

‎go.work‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.22.4
1+
go 1.22.5
22

33
use (
44
.

‎go.work.sum‎

Lines changed: 115 additions & 6 deletions
Large diffs are not rendered by default.

‎plugin.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (p *Plugin) Reset(name string) error {
3535
return svc.Reset()
3636
}
3737

38-
// Collects declares services to be collected.
38+
// Collects declare services to be collected.
3939
func (p *Plugin) Collects() []*dep.In {
4040
return []*dep.In{
4141
dep.Fits(func(pl any) {

0 commit comments

Comments
 (0)