From 86d3a6c9a6d6ff2129ecb398c9721bd39ac74cfa Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 19 Feb 2021 13:06:07 -0800 Subject: [PATCH] Switch to Go 1.16. Fixes #1370 Signed-off-by: Brad Fitzpatrick --- .github/workflows/coverage.yml | 2 +- .github/workflows/cross-darwin.yml | 2 +- .github/workflows/cross-freebsd.yml | 2 +- .github/workflows/cross-openbsd.yml | 2 +- .github/workflows/cross-windows.yml | 2 +- .github/workflows/depaware.yml | 2 +- .github/workflows/license.yml | 2 +- .github/workflows/linux.yml | 2 +- .github/workflows/linux32.yml | 2 +- .github/workflows/staticcheck.yml | 2 +- .github/workflows/windows.yml | 2 +- Dockerfile | 5 +++-- README.md | 2 +- cmd/tailscale/depaware.txt | 5 +++-- cmd/tailscaled/depaware.txt | 10 ++++------ go.mod | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 94ae6d273..d41867157 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/cross-darwin.yml b/.github/workflows/cross-darwin.yml index 17828858e..6158cc32c 100644 --- a/.github/workflows/cross-darwin.yml +++ b/.github/workflows/cross-darwin.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/cross-freebsd.yml b/.github/workflows/cross-freebsd.yml index 83532a8c7..b0793ee9f 100644 --- a/.github/workflows/cross-freebsd.yml +++ b/.github/workflows/cross-freebsd.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/cross-openbsd.yml b/.github/workflows/cross-openbsd.yml index 9fe4c0f8f..d29819f75 100644 --- a/.github/workflows/cross-openbsd.yml +++ b/.github/workflows/cross-openbsd.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/cross-windows.yml b/.github/workflows/cross-windows.yml index cda8c6b81..d1e5e4c3d 100644 --- a/.github/workflows/cross-windows.yml +++ b/.github/workflows/cross-windows.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/depaware.yml b/.github/workflows/depaware.yml index 9ca057679..829304613 100644 --- a/.github/workflows/depaware.yml +++ b/.github/workflows/depaware.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 - name: Check out code uses: actions/checkout@v1 diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 6ad078d46..9dba471f1 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 - name: Check out code uses: actions/checkout@v1 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2ba0f1f3f..e7d1ff9a6 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/linux32.yml b/.github/workflows/linux32.yml index b5ac67203..cbd812569 100644 --- a/.github/workflows/linux32.yml +++ b/.github/workflows/linux32.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/staticcheck.yml b/.github/workflows/staticcheck.yml index 4eadeb09b..4ffe1b34b 100644 --- a/.github/workflows/staticcheck.yml +++ b/.github/workflows/staticcheck.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 - name: Check out code uses: actions/checkout@v1 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index de0cdbe60..52ed8cbe2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.16.x - name: Checkout code uses: actions/checkout@v2 diff --git a/Dockerfile b/Dockerfile index 078921c4d..36b873fdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ # $ docker exec tailscaled tailscale status -FROM golang:1.15-alpine AS build-env +FROM golang:1.16-alpine AS build-env WORKDIR /go/src/tailscale @@ -48,7 +48,8 @@ RUN go mod download COPY . . -ARG goflags_arg # default intentionally unset +# see build_docker.sh +ARG goflags_arg="" ENV GOFLAGS=$goflags_arg RUN go install -v ./cmd/... diff --git a/README.md b/README.md index ac970b18b..1303bf8e5 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If your distro has conventions that preclude the use of distro's way, so that bug reports contain useful version information. We only guarantee to support the latest Go release and any Go beta or -release candidate builds (currently Go 1.15) in module mode. It might +release candidate builds (currently Go 1.16) in module mode. It might work in earlier Go versions or in GOPATH mode, but we're making no effort to keep those working. diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt index 4fb8d7d6c..cd0063857 100644 --- a/cmd/tailscale/depaware.txt +++ b/cmd/tailscale/depaware.txt @@ -35,7 +35,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep 💣 tailscale.com/net/tshttpproxy from tailscale.com/derp/derphttp+ tailscale.com/paths from tailscale.com/cmd/tailscale/cli+ tailscale.com/safesocket from tailscale.com/cmd/tailscale/cli - 💣 tailscale.com/syncs from tailscale.com/net/interfaces+ + tailscale.com/syncs from tailscale.com/net/interfaces+ tailscale.com/tailcfg from tailscale.com/cmd/tailscale/cli+ W tailscale.com/tsconst from tailscale.com/net/interfaces tailscale.com/types/empty from tailscale.com/ipn @@ -134,7 +134,8 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep hash/maphash from go4.org/mem html from tailscale.com/ipn/ipnstate io from bufio+ - io/ioutil from crypto/tls+ + io/fs from crypto/rand+ + io/ioutil from golang.org/x/oauth2/internal+ log from expvar+ math from compress/flate+ math/big from crypto/dsa+ diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index 0fd74fe8d..64e9d34ab 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -101,7 +101,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/portlist from tailscale.com/ipn/ipnlocal tailscale.com/safesocket from tailscale.com/ipn/ipnserver tailscale.com/smallzstd from tailscale.com/ipn/ipnserver+ - 💣 tailscale.com/syncs from tailscale.com/net/interfaces+ + tailscale.com/syncs from tailscale.com/net/interfaces+ tailscale.com/tailcfg from tailscale.com/control/controlclient+ W tailscale.com/tsconst from tailscale.com/net/interfaces tailscale.com/tstime from tailscale.com/wgengine/magicsock @@ -224,10 +224,10 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de hash/crc32 from compress/gzip+ hash/fnv from tailscale.com/wgengine/magicsock hash/maphash from go4.org/mem - html from html/template+ - html/template from net/http/pprof + html from net/http/pprof+ io from bufio+ - io/ioutil from crypto/tls+ + io/fs from crypto/rand+ + io/ioutil from github.com/godbus/dbus/v5+ log from expvar+ math from compress/flate+ math/big from crypto/dsa+ @@ -262,8 +262,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de sync/atomic from context+ syscall from crypto/rand+ text/tabwriter from runtime/pprof - text/template from html/template - text/template/parse from html/template+ time from compress/gzip+ unicode from bytes+ unicode/utf16 from encoding/asn1+ diff --git a/go.mod b/go.mod index a7f3bcbf3..12fd69062 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module tailscale.com -go 1.15 +go 1.16 require ( github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5