Skip to content

Commit 04df772

Browse files
aanmaanm
committed
Update Go, Alpine images and Go dependencies
- Bump golang base image to 1.26.3 - Bump alpine base image to 3.23.4 - Update palantir/go-baseapp to v0.7.0 - Update palantir/go-githubapp to v0.44.0 - Align google/go-github to v85 (matches palantir/go-githubapp v0.44.0) - Update golang.org/x/net to v0.55.0 - Update golang.org/x/sys to v0.45.0 - Refresh vendored dependencies Signed-off-by: André Martins <andre@cilium.io>
1 parent d4cee6b commit 04df772

303 files changed

Lines changed: 100045 additions & 870 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM docker.io/library/golang:1.26.2@sha256:b54cbf583d390341599d7bcbc062425c081105cc5ef6d170ced98ef9d047c716 as builder
1+
FROM docker.io/library/golang:1.26.3@sha256:2d6c80227255c3112a4d08e67ba98e58efd3846daf15d9d7d4c389565d881b1a as builder
22
LABEL maintainer="maintainer@cilium.io"
33
ADD . /go/src/github.com/cilium/github-actions
44
WORKDIR /go/src/github.com/cilium/github-actions
55
RUN make github-actions
66
RUN strip github-actions
77

8-
FROM docker.io/library/alpine:3.21.7@sha256:48b0309ca019d89d40f670aa1bc06e426dc0931948452e8491e3d65087abc07d as certs
8+
FROM docker.io/library/alpine:3.23.4@sha256:5b10f432ef3da1b8d4c7eb6c487f2f5a8f096bc91145e68878dd4a5019afde11 as certs
99
RUN apk --update add ca-certificates
1010

1111
FROM scratch

‎cmd/handlers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222

2323
"github.com/cilium/github-actions/pkg/github"
24-
gh "github.com/google/go-github/v84/github"
24+
gh "github.com/google/go-github/v85/github"
2525
"github.com/palantir/go-githubapp/githubapp"
2626
"github.com/pkg/errors"
2727
"github.com/rs/zerolog"

‎go.mod‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ go 1.26.0
44

55
require (
66
github.com/bndr/gojenkins v1.2.0
7-
github.com/google/go-github/v84 v84.0.0
7+
github.com/google/go-github/v85 v85.0.0
88
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
9-
github.com/palantir/go-baseapp v0.6.0
10-
github.com/palantir/go-githubapp v0.43.0
9+
github.com/palantir/go-baseapp v0.7.0
10+
github.com/palantir/go-githubapp v0.44.0
1111
github.com/patrickmn/go-cache v2.1.0+incompatible
1212
github.com/pkg/errors v0.9.1
1313
github.com/rs/zerolog v1.35.1
@@ -24,6 +24,7 @@ require (
2424
github.com/bradleyfalzon/ghinstallation/v2 v2.18.0 // indirect
2525
github.com/davecgh/go-spew v1.1.1 // indirect
2626
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
27+
github.com/google/go-github/v84 v84.0.0 // indirect
2728
github.com/google/go-querystring v1.2.0 // indirect
2829
github.com/hashicorp/golang-lru v1.0.2 // indirect
2930
github.com/mattn/go-colorable v0.1.14 // indirect
@@ -33,7 +34,7 @@ require (
3334
github.com/rs/xid v1.6.0 // indirect
3435
github.com/shurcooL/githubv4 v0.0.0-20260209031235-2402fdf4a9ed // indirect
3536
github.com/shurcooL/graphql v0.0.0-20240915155400-7ee5256398cf // indirect
36-
golang.org/x/net v0.53.0 // indirect
37-
golang.org/x/sys v0.43.0 // indirect
37+
golang.org/x/net v0.55.0 // indirect
38+
golang.org/x/sys v0.45.0 // indirect
3839
gopkg.in/yaml.v3 v3.0.1 // indirect
3940
)

‎go.sum‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
1414
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
1515
github.com/google/go-github/v84 v84.0.0 h1:I/0Xn5IuChMe8TdmI2bbim5nyhaRFJ7DEdzmD2w+yVA=
1616
github.com/google/go-github/v84 v84.0.0/go.mod h1:WwYL1z1ajRdlaPszjVu/47x1L0PXukJBn73xsiYrRRQ=
17+
github.com/google/go-github/v85 v85.0.0 h1:1+TLFX/akTFXK7o9Z9uAloQGufOn4ySa5DItUM1VWT4=
18+
github.com/google/go-github/v85 v85.0.0/go.mod h1:jYkBnqN+SzR2A2fGKYfbt6DEEQAyxeK0Q2XpPV9ZFsU=
1719
github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0=
1820
github.com/google/go-querystring v1.2.0/go.mod h1:8IFJqpSRITyJ8QhQ13bmbeMBDfmeEJZD5A0egEOmkqU=
1921
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
@@ -24,16 +26,17 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
2426
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
2527
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
2628
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
27-
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
2829
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
30+
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
31+
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
2932
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
3033
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
3134
github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
3235
github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
33-
github.com/palantir/go-baseapp v0.6.0 h1:59UU9rgrd4x2QP/Hb0XqZJ5ZCH6m7BaaPnA+VWKWaTI=
34-
github.com/palantir/go-baseapp v0.6.0/go.mod h1:sa/waQhryV7OlPMykG0MUT+nsLtDxdHHPv5Q60hA/Ek=
35-
github.com/palantir/go-githubapp v0.43.0 h1:rQyJdlqXj7fmnA6sET3ac4M2eu81jMnjJgjUt8aO5S4=
36-
github.com/palantir/go-githubapp v0.43.0/go.mod h1:NLtySNwMkU/vje1WulODnSFtankGb4LB6TJoGoE95ek=
36+
github.com/palantir/go-baseapp v0.7.0 h1:KsnCqz2T2j2m21JI149p8HUata9ubvVl2aKbw71u8qA=
37+
github.com/palantir/go-baseapp v0.7.0/go.mod h1:EvMBTXraSU+5cRCZTNt4e+eNty7t2me565Gr/6wc4/I=
38+
github.com/palantir/go-githubapp v0.44.0 h1:6QXYxgot6tHnObwJ09mrhzVg9K2DA0lQgQHj0q/BX4Y=
39+
github.com/palantir/go-githubapp v0.44.0/go.mod h1:vFTHSErTFXirDg18QMtFPKDbQ/NB6n8JE8L1yG/3Ij0=
3740
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
3841
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
3942
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -60,14 +63,14 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
6063
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
6164
goji.io v2.0.2+incompatible h1:uIssv/elbKRLznFUy3Xj4+2Mz/qKhek/9aZQDUMae7c=
6265
goji.io v2.0.2+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk=
63-
golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
64-
golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
66+
golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
67+
golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
6568
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
6669
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
6770
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
6871
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
69-
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
70-
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
72+
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
73+
golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
7174
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
7275
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
7376
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

‎pkg/github/automerge.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"strings"
2121
"time"
2222

23-
gh "github.com/google/go-github/v84/github"
23+
gh "github.com/google/go-github/v85/github"
2424
)
2525

2626
type AutoMerge struct {
@@ -176,7 +176,7 @@ func (c *Client) AutoMerge(
176176
ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second)
177177
defer cancel()
178178
_, _, err = c.GHClient.Issues.CreateComment(ctx, owner, repoName, prNumber, &gh.IssueComment{
179-
Body: func() *string { ; return new(fmt.Sprintf("Setting %s to let a human merge this PR.", cfg.Label)) }(),
179+
Body: func() *string { return new(fmt.Sprintf("Setting %s to let a human merge this PR.", cfg.Label)) }(),
180180
})
181181
if err != nil {
182182
return err

‎pkg/github/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"time"
2222

2323
"github.com/cilium/github-actions/pkg/jenkins"
24-
gh "github.com/google/go-github/v84/github"
24+
gh "github.com/google/go-github/v85/github"
2525
"github.com/rs/zerolog"
2626
"golang.org/x/oauth2"
2727
)

‎pkg/github/comments.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"regexp"
2121

2222
"github.com/cilium/github-actions/pkg/jenkins"
23-
gh "github.com/google/go-github/v84/github"
23+
gh "github.com/google/go-github/v85/github"
2424
)
2525

2626
type MLHCommand string
@@ -45,7 +45,7 @@ func (c *Client) CommentAndOpenIssue(ctx context.Context, owner, repo string, is
4545
}
4646

4747
_, _, err = c.GHClient.Issues.Edit(ctx, owner, repo, issueNumber, &gh.IssueRequest{
48-
State: func() *string { ; return new("open") }(),
48+
State: func() *string { return new("open") }(),
4949
})
5050

5151
return err

‎pkg/github/commits.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"strings"
2323
"time"
2424

25-
gh "github.com/google/go-github/v84/github"
25+
gh "github.com/google/go-github/v85/github"
2626
)
2727

2828
type MsgInCommit struct {

‎pkg/github/handlers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"time"
2424

2525
"github.com/cilium/github-actions/pkg/jenkins"
26-
gh "github.com/google/go-github/v84/github"
26+
gh "github.com/google/go-github/v85/github"
2727
)
2828

2929
func (c *Client) HandlePullRequestEvent(cfg PRBlockerConfig, pre *gh.PullRequestEvent) error {

‎pkg/github/issues.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/cilium/github-actions/pkg/jenkins"
2424
"github.com/cilium/github-actions/pkg/progress"
25-
gh "github.com/google/go-github/v84/github"
25+
gh "github.com/google/go-github/v85/github"
2626
)
2727

2828
const (

0 commit comments

Comments
 (0)