Skip to content

Commit f3d7ce7

Browse files
prymitiveprymitive
authored
Merge pull request #1636 from cloudflare/majors
Update all deps to the next major version
2 parents 71854f9 + 4a35247 commit f3d7ce7

File tree

9 files changed

+109
-105
lines changed

9 files changed

+109
-105
lines changed

‎.github/workflows/deps.yml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,3 @@ jobs:
1414

1515
- name: "Dependency Review"
1616
uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
17-
18-
govulncheck:
19-
runs-on: ubuntu-latest
20-
steps:
21-
- name: "Checkout Repository"
22-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
23-
with:
24-
show-progress: false
25-
26-
- id: govulncheck
27-
uses: golang/govulncheck-action@b625fbe08f3bccbe446d94fbf87fcc875a4f50ee # v1.0.4
28-
with:
29-
go-version-input: stable
30-
check-latest: true

‎.github/workflows/govulncheck.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: "Go Vulncheck"
2+
on: [pull_request]
3+
4+
permissions: read-all
5+
6+
jobs:
7+
govulncheck:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: "Checkout Repository"
11+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
12+
with:
13+
show-progress: false
14+
15+
- id: govulncheck
16+
uses: golang/govulncheck-action@b625fbe08f3bccbe446d94fbf87fcc875a4f50ee # v1.0.4
17+
with:
18+
go-version-input: stable
19+
check-latest: true

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/cespare/xxhash/v2 v2.3.0
88
github.com/gkampitakis/go-snaps v0.5.16
99
github.com/google/go-cmp v0.7.0
10-
github.com/google/go-github/v78 v78.0.0
10+
github.com/google/go-github/v79 v79.0.0
1111
github.com/hashicorp/hcl/v2 v2.24.0
1212
github.com/itchyny/json2yaml v0.1.4
1313
github.com/klauspost/compress v1.18.1
@@ -21,7 +21,7 @@ require (
2121
github.com/stretchr/testify v1.11.1
2222
github.com/urfave/cli/v3 v3.6.1
2323
github.com/zclconf/go-cty v1.17.0
24-
gitlab.com/gitlab-org/api/client-go v0.161.0
24+
gitlab.com/gitlab-org/api/client-go v1.2.0
2525
go.nhat.io/httpmock v0.11.0
2626
go.uber.org/automaxprocs v1.6.0
2727
go.uber.org/ratelimit v0.3.1
@@ -77,13 +77,13 @@ require (
7777
go.opentelemetry.io/otel/trace v1.38.0 // indirect
7878
go.uber.org/atomic v1.11.0 // indirect
7979
go.yaml.in/yaml/v2 v2.4.3 // indirect
80-
golang.org/x/exp v0.0.0-20250808145144-a408d31f581a // indirect
81-
golang.org/x/mod v0.28.0 // indirect
82-
golang.org/x/sync v0.17.0 // indirect
83-
golang.org/x/sys v0.37.0 // indirect
84-
golang.org/x/text v0.30.0 // indirect
85-
golang.org/x/time v0.13.0 // indirect
86-
golang.org/x/tools v0.37.0 // indirect
80+
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect
81+
golang.org/x/mod v0.29.0 // indirect
82+
golang.org/x/sync v0.18.0 // indirect
83+
golang.org/x/sys v0.38.0 // indirect
84+
golang.org/x/text v0.31.0 // indirect
85+
golang.org/x/time v0.14.0 // indirect
86+
golang.org/x/tools v0.38.0 // indirect
8787
google.golang.org/protobuf v1.36.10 // indirect
8888
gopkg.in/yaml.v3 v3.0.1 // indirect
8989
)

‎go.sum‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
9797
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
9898
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
9999
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
100-
github.com/google/go-github/v78 v78.0.0 h1:b1tytzFE8i//lRVDx5Qh/EdJbtTPtSVD3nF7hraEs9w=
101-
github.com/google/go-github/v78 v78.0.0/go.mod h1:Uxvdzy82AkNlC6JQ57se9TqvmgBT7RF0ouHDNg2jd6g=
100+
github.com/google/go-github/v79 v79.0.0 h1:MdodQojuFPBhmtwHiBcIGLw/e/wei2PvFX9ndxK0X4Y=
101+
github.com/google/go-github/v79 v79.0.0/go.mod h1:OAFbNhq7fQwohojb06iIIQAB9CBGYLq999myfUFnrS4=
102102
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
103103
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
104104
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -232,8 +232,8 @@ github.com/zclconf/go-cty v1.17.0 h1:seZvECve6XX4tmnvRzWtJNHdscMtYEx5R7bnnVyd/d0
232232
github.com/zclconf/go-cty v1.17.0/go.mod h1:wqFzcImaLTI6A5HfsRwB0nj5n0MRZFwmey8YoFPPs3U=
233233
github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
234234
github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
235-
gitlab.com/gitlab-org/api/client-go v0.161.0 h1:Psrv69hWOtcFa87jcriJUQdolx5WlBFYUXwZVa4p8Co=
236-
gitlab.com/gitlab-org/api/client-go v0.161.0/go.mod h1:YqKcnxyV9OPAL5U99mpwBVEgBPz1PK/3qwqq/3h6bao=
235+
gitlab.com/gitlab-org/api/client-go v1.2.0 h1:D8v1XDL/PahIMBKIPT5qiYa5CFUFTlwkpdVkEek4bi4=
236+
gitlab.com/gitlab-org/api/client-go v1.2.0/go.mod h1:RQfw64j1FE+KMZUAKsi1ZOOvwbWxHn9SkyZg+IAvjk4=
237237
go.nhat.io/httpmock v0.11.0 h1:GSADjr4/sn1HXqnyluPr9PYpSmMh/h3ty0O7lEozD3c=
238238
go.nhat.io/httpmock v0.11.0/go.mod h1:276uIJ0K7BYfC8EW2WUK4S9PyEjiR71Ex0+43b3eNtk=
239239
go.nhat.io/matcher/v2 v2.0.0 h1:W+rbHi0hKuZHtOQH4U5g+KwyKyfVioIxrxjoGRcUETE=
@@ -267,12 +267,12 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
267267
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
268268
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
269269
golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
270-
golang.org/x/exp v0.0.0-20250808145144-a408d31f581a h1:Y+7uR/b1Mw2iSXZ3G//1haIiSElDQZ8KWh0h+sZPG90=
271-
golang.org/x/exp v0.0.0-20250808145144-a408d31f581a/go.mod h1:rT6SFzZ7oxADUDx58pcaKFTcZ+inxAa9fTrYx/uVYwg=
270+
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 h1:SbTAbRFnd5kjQXbczszQ0hdk3ctwYf3qBNH9jIsGclE=
271+
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
272272
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
273273
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
274-
golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
275-
golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
274+
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
275+
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
276276
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
277277
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
278278
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -284,25 +284,25 @@ golang.org/x/oauth2 v0.33.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwE
284284
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
285285
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
286286
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
287-
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
288-
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
287+
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
288+
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
289289
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
290290
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
291291
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
292-
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
293-
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
292+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
293+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
294294
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
295295
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
296-
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
297-
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
298-
golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI=
299-
golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
296+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
297+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
298+
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
299+
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
300300
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
301301
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
302302
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
303303
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
304-
golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
305-
golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
304+
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
305+
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
306306
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
307307
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
308308
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎internal/config/repository.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (gh GitHub) validate() error {
8989
type GitLab struct {
9090
URI string `hcl:"uri,optional"`
9191
Timeout string `hcl:"timeout,optional"`
92-
Project int `hcl:"project"`
92+
Project int64 `hcl:"project"`
9393
MaxComments int `hcl:"maxComments,optional"`
9494
}
9595

‎internal/reporter/comments_test.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,6 @@ func TestCommentsCommonPaths(t *testing.T) {
773773

774774
reports []Report
775775
timeout time.Duration
776-
project int
777776
maxComments int
778777
showDuplicates bool
779778
}
@@ -809,7 +808,6 @@ func TestCommentsCommonPaths(t *testing.T) {
809808
branch: "fakeBranch",
810809
token: "fakeToken",
811810
timeout: time.Second,
812-
project: 123,
813811
maxComments: 50,
814812
reports: []Report{fooReport},
815813
httpHandler: http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
@@ -828,7 +826,6 @@ func TestCommentsCommonPaths(t *testing.T) {
828826
branch: "fakeBranch",
829827
token: "fakeToken",
830828
timeout: time.Second,
831-
project: 123,
832829
maxComments: 50,
833830
reports: []Report{fooReport},
834831
httpHandler: http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
@@ -848,7 +845,6 @@ func TestCommentsCommonPaths(t *testing.T) {
848845
branch: "fakeBranch",
849846
token: "fakeToken",
850847
timeout: time.Second,
851-
project: 123,
852848
maxComments: 50,
853849
reports: []Report{fooReport},
854850
httpHandler: http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
@@ -867,7 +863,6 @@ func TestCommentsCommonPaths(t *testing.T) {
867863
branch: "fakeBranch",
868864
token: "fakeToken",
869865
timeout: time.Second,
870-
project: 123,
871866
maxComments: 50,
872867
reports: []Report{fooReport},
873868
httpHandler: http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
@@ -892,7 +887,7 @@ func TestCommentsCommonPaths(t *testing.T) {
892887
uri,
893888
tc.timeout,
894889
tc.token,
895-
tc.project,
890+
123,
896891
tc.maxComments,
897892
)
898893
require.NoError(t, err, "can't create gitlab reporter")

‎internal/reporter/github.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/google/go-github/v78/github"
12+
"github.com/google/go-github/v79/github"
1313
"golang.org/x/oauth2"
1414

1515
"github.com/cloudflare/pint/internal/checks"
@@ -428,22 +428,22 @@ func (gr GithubReporter) fixCommentLine(dst any, p PendingComment) (string, int)
428428

429429
line := p.line
430430
diffs := parseDiffLines(file.GetPatch())
431-
dl, ok := diffLineFor(diffs, p.line)
431+
dl, ok := diffLineFor(diffs, int64(p.line))
432432
switch {
433433
case ok && dl.wasModified && p.anchor == checks.AnchorAfter:
434434
// Comment on new or modified line.
435-
line = dl.new
435+
line = int(dl.new) // FIXME int64 -> int
436436
case ok && dl.wasModified && p.anchor == checks.AnchorBefore:
437437
// Comment on new or modified line.
438-
line = dl.old
438+
line = int(dl.old) // FIXME int64 -> int
439439
default:
440440
// Comment on unmodified line.
441441
// Find first modified line and put it there.
442442
for _, d := range diffs {
443443
if !d.wasModified {
444444
continue
445445
}
446-
line = d.new
446+
line = int(d.new) // FIXME int64 -> int
447447
side = "RIGHT"
448448
break
449449
}

0 commit comments

Comments
 (0)