Skip to content

Commit 85ef2c9

Browse files
committed
chore(deps): update dependencies
1 parent 8311907 commit 85ef2c9

File tree

15 files changed

+226
-100
lines changed

15 files changed

+226
-100
lines changed

.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/[email protected] # Action page: <https://github.com/golangci/golangci-lint-action>
2020
with:
21-
version: v1.54 # 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
timeout-minutes: 60
1818
strategy:
1919
matrix:
20-
php: [ "8.2" ]
20+
php: [ "8.3" ]
2121
go: [ stable ]
2222
os: [ "ubuntu-latest" ]
2323
steps:

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@
1616
vendor/
1717

1818
.idea
19-
.DS_Store
19+
.DS_Store
20+
**/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: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
module github.com/roadrunner-server/proxy_ip_parser/v4
1+
module github.com/roadrunner-server/proxy_ip_parser/v5
22

3-
go 1.22.4
3+
go 1.22.5
44

55
require (
6+
github.com/roadrunner-server/context v1.0.0
67
github.com/roadrunner-server/errors v1.4.0
7-
github.com/roadrunner-server/sdk/v4 v4.7.3
88
github.com/stretchr/testify v1.9.0
9-
go.opentelemetry.io/otel/trace v1.27.0
9+
go.opentelemetry.io/otel/trace v1.28.0
1010
go.uber.org/zap v1.27.0
1111
)
1212

1313
require (
1414
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1515
github.com/kr/pretty v0.3.1 // indirect
1616
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
17-
github.com/roadrunner-server/tcplisten v1.4.0 // indirect
1817
github.com/rogpeppe/go-internal v1.12.0 // indirect
19-
go.opentelemetry.io/otel v1.27.0 // indirect
18+
go.opentelemetry.io/otel v1.28.0 // indirect
2019
go.uber.org/multierr v1.11.0 // indirect
2120
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2221
gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,19 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
1313
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
1414
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
1515
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
16+
github.com/roadrunner-server/context v1.0.0 h1:KKqTQkiJPEzuesJW2v6CIy4T4WUYOOhmftITjUDBASE=
17+
github.com/roadrunner-server/context v1.0.0/go.mod h1:rF0U1emlrMXBwvVoocD4ER/uJMytzVoXYt/kuflKKnA=
1618
github.com/roadrunner-server/errors v1.4.0 h1:Odjg3VZrj1q5Y8ILwoN+JgERyv0pkhrWPNOM4h68iQ8=
1719
github.com/roadrunner-server/errors v1.4.0/go.mod h1:78PvraAFj+Sxy5nDmo0S+h6rEMLFIDszWZxA3B0sPAs=
18-
github.com/roadrunner-server/sdk/v4 v4.7.3 h1:w007xSk96SDFH/IJ3ZsP3AkU5opnw2/g+cBjQxd+WGA=
19-
github.com/roadrunner-server/sdk/v4 v4.7.3/go.mod h1:pOHmaPzvxOn/xhKC9tHibHYSyNXWlUDQvp7pcRiuDGE=
20-
github.com/roadrunner-server/tcplisten v1.4.0 h1:yWo09zktv/CSV6VywLfw4pwNcUchgTiIrW4uIICtO5M=
21-
github.com/roadrunner-server/tcplisten v1.4.0/go.mod h1:A6+VSnW2ETGnN/e/CMdP63ZXqQDaC0UDMU6QmyuB0yM=
2220
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
2321
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
2422
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
2523
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
2624
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
27-
go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg=
28-
go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ=
29-
go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw=
30-
go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4=
25+
go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
26+
go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
27+
go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
28+
go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
3129
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
3230
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
3331
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

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
.

0 commit comments

Comments
 (0)