Skip to content

Commit 1e05f63

Browse files
authored
Merge pull request #3017 from aldas/v4_ci_updates
Update CI action versions for v4 branch
2 parents aa52f6a + 11a3cc4 commit 1e05f63

5 files changed

Lines changed: 30 additions & 15 deletions

File tree

.github/workflows/checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Checkout Code
26-
uses: actions/checkout@v5
26+
uses: actions/checkout@v6
2727

2828
- name: Set up Go ${{ matrix.go }}
29-
uses: actions/setup-go@v5
29+
uses: actions/setup-go@v6
3030
with:
3131
go-version: ${{ env.LATEST_GO_VERSION }}
3232
check-latest: true

.github/workflows/echo.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ jobs:
2525
os: [ubuntu-latest, macos-latest, windows-latest]
2626
# Each major Go release is supported until there are two newer major releases. https://golang.org/doc/devel/release.html#policy
2727
# Echo tests with last four major releases (unless there are pressing vulnerabilities)
28-
# As we depend on `golang.org/x/` libraries which only support last 2 Go releases we could have situations when
29-
# we derive from last four major releases promise.
28+
# As we depend on `golang.org/x/` libraries which only support the last 2 Go releases, we could have situations when
29+
# we derive from the last four major releases promise.
3030
go: ["1.25", "1.26"]
3131
name: ${{ matrix.os }} @ Go ${{ matrix.go }}
3232
runs-on: ${{ matrix.os }}
3333
steps:
3434
- name: Checkout Code
35-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3636

3737
- name: Set up Go ${{ matrix.go }}
38-
uses: actions/setup-go@v5
38+
uses: actions/setup-go@v6
3939
with:
4040
go-version: ${{ matrix.go }}
4141

@@ -44,7 +44,7 @@ jobs:
4444

4545
- name: Upload coverage to Codecov
4646
if: success() && matrix.go == env.LATEST_GO_VERSION && matrix.os == 'ubuntu-latest'
47-
uses: codecov/codecov-action@v5
47+
uses: codecov/codecov-action@v6
4848
with:
4949
token:
5050
fail_ci_if_error: false
@@ -55,18 +55,18 @@ jobs:
5555
runs-on: ubuntu-latest
5656
steps:
5757
- name: Checkout Code (Previous)
58-
uses: actions/checkout@v5
58+
uses: actions/checkout@v6
5959
with:
6060
ref: ${{ github.base_ref }}
6161
path: previous
6262

6363
- name: Checkout Code (New)
64-
uses: actions/checkout@v5
64+
uses: actions/checkout@v6
6565
with:
6666
path: new
6767

6868
- name: Set up Go ${{ matrix.go }}
69-
uses: actions/setup-go@v5
69+
uses: actions/setup-go@v6
7070
with:
7171
go-version: ${{ env.LATEST_GO_VERSION }}
7272

echo.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import (
5959
"golang.org/x/crypto/acme"
6060
"golang.org/x/crypto/acme/autocert"
6161
"golang.org/x/net/http2"
62+
//lint:ignore SA1019 h2c is required until v4 is supported (end of 2026)
6263
"golang.org/x/net/http2/h2c"
6364
)
6465

@@ -845,6 +846,7 @@ func (e *Echo) StartH2CServer(address string, h2s *http2.Server) error {
845846
s.Addr = address
846847
e.colorer.SetOutput(e.Logger.Output())
847848
s.ErrorLog = e.StdLogger
849+
//lint:ignore SA1019 h2c is required until v4 is supported (end of 2026)
848850
s.Handler = h2c.NewHandler(e, h2s)
849851
if e.Debug {
850852
e.Logger.SetLevel(log.DEBUG)

go.mod

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@ module github.com/labstack/echo/v4
33
go 1.25.0
44

55
require (
6+
github.com/labstack/echo/v5 v5.2.1
67
github.com/labstack/gommon v0.5.0
78
github.com/stretchr/testify v1.11.1
89
github.com/valyala/fasttemplate v1.2.2
9-
golang.org/x/crypto v0.50.0
10-
golang.org/x/net v0.53.0
10+
golang.org/x/crypto v0.53.0
11+
golang.org/x/net v0.56.0
1112
golang.org/x/time v0.15.0
1213
)
1314

1415
require (
1516
github.com/davecgh/go-spew v1.1.1 // indirect
16-
github.com/mattn/go-colorable v0.1.14 // indirect
17+
github.com/mattn/go-colorable v0.1.15 // indirect
1718
github.com/mattn/go-isatty v0.0.22 // indirect
1819
github.com/pmezard/go-difflib v1.0.0 // indirect
1920
github.com/valyala/bytebufferpool v1.0.0 // indirect
20-
golang.org/x/sys v0.43.0 // indirect
21-
golang.org/x/text v0.36.0 // indirect
21+
golang.org/x/sys v0.46.0 // indirect
22+
golang.org/x/text v0.38.0 // indirect
2223
gopkg.in/yaml.v3 v3.0.1 // indirect
2324
)

go.sum

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3+
github.com/labstack/echo/v5 v5.2.1 h1:TzpIksY6zLMzV0T0ycYbvTEoj9w6o6AcL5twg182VTY=
4+
github.com/labstack/echo/v5 v5.2.1/go.mod h1:SyvlSdObGjRXeQfCCXW/sybkZdOOQZBmpKF0bvALaeo=
35
github.com/labstack/gommon v0.5.0 h1:6VSQ2NOzsnEJ5W6+84E0RbcaDDmgB6NIAzWCczTEe6c=
46
github.com/labstack/gommon v0.5.0/go.mod h1:Rzlg7HHy1maLfzBYGg9NZcVuz1sA68HHhLjhcEllYE0=
57
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
68
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
9+
github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY=
10+
github.com/mattn/go-colorable v0.1.15/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
711
github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
812
github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
913
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -16,12 +20,20 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ
1620
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
1721
golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
1822
golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
23+
golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
24+
golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
1925
golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
2026
golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
27+
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
28+
golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
2129
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
2230
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
31+
golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
32+
golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
2333
golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
2434
golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
35+
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
36+
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
2537
golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
2638
golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
2739
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

0 commit comments

Comments
 (0)