Skip to content

Commit d69bde0

Browse files
authored
Disable http3 for go1.20+ (#30)
1 parent 5aacebe commit d69bde0

File tree

10 files changed

+122
-137
lines changed

10 files changed

+122
-137
lines changed

.github/workflows/golangci-lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
go-version: 1.19.x
2525
- uses: actions/checkout@v2
2626
- name: golangci-lint
27-
uses: golangci/golangci-lint-action@v3.1.0
27+
uses: golangci/golangci-lint-action@v3.2.0
2828
with:
2929
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
30-
version: v1.49.0
30+
version: v1.50.0
3131

3232
# Optional: working directory, useful for monorepos
3333
# working-directory: somedir

.github/workflows/test-unit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
test:
2222
strategy:
2323
matrix:
24-
go-version: [ 1.18.x, 1.19.x ]
24+
go-version: [ 1.18.x, 1.19.x, tip ]
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Install Go stable

.golangci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ linters:
5252
- structcheck
5353
- varcheck
5454
- deadcode
55+
- testableexamples
56+
- dupword
5557

5658
issues:
5759
exclude-use-default: false
@@ -70,5 +72,6 @@ issues:
7072
path: "_test.go"
7173
- linters:
7274
- errcheck # Error checking omitted for brevity.
75+
- gosec
7376
path: "example_"
7477

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#GOLANGCI_LINT_VERSION := "v1.49.0" # Optional configuration to pinpoint golangci-lint version.
1+
#GOLANGCI_LINT_VERSION := "v1.50.0" # Optional configuration to pinpoint golangci-lint version.
22

33
# The head of Makefile determines location of dev-go to include standard targets.
44
GO ?= go
@@ -35,7 +35,7 @@ BUILD_LDFLAGS="-s -w"
3535
-include $(DEVGO_PATH)/makefiles/test-unit.mk
3636
-include $(DEVGO_PATH)/makefiles/bench.mk
3737
-include $(DEVGO_PATH)/makefiles/reset-ci.mk
38-
-include $(DEVGO_PATH)/makefiles/release-assets.mk
38+
include $(DEVGO_PATH)/makefiles/release-assets.mk
3939
-include $(DEVGO_PATH)/makefiles/build.mk
4040

4141
# Add your custom targets here.

curl/cmd.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ func AddCommand(lf *loadgen.Flags, options ...func(lf *loadgen.Flags, f *nethttp
5151
curl := kingpin.Command("curl", "Repetitive HTTP transfer")
5252

5353
curl.Flag("fast", "Use fasthttp to achieve higher request rate").BoolVar(&flags.Fast)
54-
curl.Flag("http3", "Use quic-go http3").BoolVar(&flags.HTTP3)
54+
55+
if nethttp.HTTP3Available {
56+
curl.Flag("http3", "Use quic-go http3").BoolVar(&flags.HTTP3)
57+
}
58+
5559
curl.Flag("2.0", `Workaround of Firefox "Copy as cURL" incompatibility.`).Bool()
5660
curl.Arg("url", "The URL.").StringVar(&flags.URL)
5761

go.mod

+19-22
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,42 @@ go 1.18
44

55
require (
66
github.com/alecthomas/kingpin v2.2.6+incompatible
7-
github.com/aws/aws-sdk-go v1.44.103
8-
github.com/bool64/dev v0.2.20
7+
github.com/aws/aws-sdk-go v1.44.152
8+
github.com/bool64/dev v0.2.22
99
github.com/gizak/termui/v3 v3.1.0
10-
github.com/lucas-clemente/quic-go v0.29.0
10+
github.com/lucas-clemente/quic-go v0.31.0
1111
github.com/nsf/termbox-go v1.1.1
12-
github.com/stretchr/testify v1.8.0
13-
github.com/valyala/fasthttp v1.40.0
12+
github.com/stretchr/testify v1.8.1
13+
github.com/valyala/fasthttp v1.43.0
1414
github.com/vearutop/dynhist-go v1.0.0
15-
golang.org/x/net v0.0.0-20220921203646-d300de134e69
16-
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
15+
golang.org/x/net v0.2.0
16+
golang.org/x/time v0.2.0
1717
)
1818

1919
require (
2020
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
2121
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
2222
github.com/andybalholm/brotli v1.0.4 // indirect
2323
github.com/davecgh/go-spew v1.1.1 // indirect
24-
github.com/fsnotify/fsnotify v1.5.4 // indirect
2524
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
2625
github.com/golang/mock v1.6.0 // indirect
27-
github.com/golang/protobuf v1.5.2 // indirect
26+
github.com/google/pprof v0.0.0-20221203041831-ce31453925ec // indirect
2827
github.com/jmespath/go-jmespath v0.4.0 // indirect
29-
github.com/klauspost/compress v1.15.10 // indirect
30-
github.com/marten-seemann/qpack v0.2.1 // indirect
31-
github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
32-
github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
28+
github.com/klauspost/compress v1.15.12 // indirect
29+
github.com/marten-seemann/qpack v0.3.0 // indirect
30+
github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
31+
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
3332
github.com/mattn/go-runewidth v0.0.13 // indirect
3433
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
35-
github.com/nxadm/tail v1.4.8 // indirect
36-
github.com/onsi/ginkgo v1.16.5 // indirect
34+
github.com/onsi/ginkgo/v2 v2.5.1 // indirect
3735
github.com/pmezard/go-difflib v1.0.0 // indirect
3836
github.com/rivo/uniseg v0.2.0 // indirect
3937
github.com/valyala/bytebufferpool v1.0.0 // indirect
40-
golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 // indirect
41-
golang.org/x/exp v0.0.0-20220921164117-439092de6870 // indirect
42-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
43-
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
44-
golang.org/x/text v0.3.7 // indirect
45-
golang.org/x/tools v0.1.12 // indirect
46-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
38+
golang.org/x/crypto v0.3.0 // indirect
39+
golang.org/x/exp v0.0.0-20221126150942-6ab00d035af9 // indirect
40+
golang.org/x/mod v0.7.0 // indirect
41+
golang.org/x/sys v0.2.0 // indirect
42+
golang.org/x/text v0.4.0 // indirect
43+
golang.org/x/tools v0.3.0 // indirect
4744
gopkg.in/yaml.v3 v3.0.1 // indirect
4845
)

0 commit comments

Comments
 (0)