Skip to content

Commit 013bdbd

Browse files
committed
TUN-6718: Bump go and go-boring 1.18.6
1 parent b639b66 commit 013bdbd

File tree

10 files changed

+18
-14
lines changed

10 files changed

+18
-14
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ quic-deps:
302302

303303
.PHONY: vet
304304
vet:
305-
go vet -mod=vendor ./...
305+
go vet -v -mod=vendor ./...
306306

307307
.PHONY: goimports
308308
goimports:

cfsetup.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pinned_go: &pinned_go go=1.18.5-1
2-
pinned_go_fips: &pinned_go_fips go-boring=1.18.5-2
1+
pinned_go: &pinned_go go=1.18.6-1
2+
pinned_go_fips: &pinned_go_fips go-boring=1.18.6-1
33

44
build_dir: &build_dir /cfsetup_build
55
default-flavor: bullseye
@@ -255,8 +255,8 @@ centos-7:
255255
pre-cache:
256256
- yum install -y fakeroot
257257
- yum upgrade -y binutils-2.27-44.base.el7.x86_64
258-
- wget https://go.dev/dl/go1.18.5.linux-amd64.tar.gz -P /tmp/
259-
- tar -C /usr/local -xzf /tmp/go1.18.5.linux-amd64.tar.gz
258+
- wget https://go.dev/dl/go1.18.6.linux-amd64.tar.gz -P /tmp/
259+
- tar -C /usr/local -xzf /tmp/go1.18.6.linux-amd64.tar.gz
260260
post-cache:
261261
- export PATH=$PATH:/usr/local/go/bin
262262
- export GOOS=linux

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.18.1 as builder
1+
FROM golang:1.18 as builder
22
ENV GO111MODULE=on \
33
CGO_ENABLED=0
44
WORKDIR /go/src/github.com/cloudflare/cloudflared/

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
go.opentelemetry.io/proto/otlp v0.15.0
3636
go.uber.org/automaxprocs v1.4.0
3737
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
38-
golang.org/x/net v0.0.0-20220812174116-3211cb980234
38+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591
3939
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
4040
golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664
4141
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,8 +715,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
715715
golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
716716
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
717717
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
718-
golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
719-
golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
718+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI=
719+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
720720
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
721721
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
722722
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=

vendor/golang.org/x/net/bpf/vm_instructions.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/net/context/go17.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/net/http2/server.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/net/internal/socket/sys_zos_s390x.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ golang.org/x/crypto/ssh/terminal
367367
## explicit; go 1.12
368368
golang.org/x/mod/module
369369
golang.org/x/mod/semver
370-
# golang.org/x/net v0.0.0-20220812174116-3211cb980234
370+
# golang.org/x/net v0.0.0-20220909164309-bea034e7d591
371371
## explicit; go 1.17
372372
golang.org/x/net/bpf
373373
golang.org/x/net/context

0 commit comments

Comments
 (0)