diff --git a/.github/workflows/cross-darwin.yml b/.github/workflows/cross-darwin.yml index 32c7c4761..e5f487b34 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@v3 with: - go-version: 1.18 + go-version: 1.19 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 21e08c405..7b9cb00f6 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@v3 with: - go-version: 1.18 + go-version: 1.19 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 2e60dfde0..e23953443 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@v3 with: - go-version: 1.18 + go-version: 1.19 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/cross-wasm.yml b/.github/workflows/cross-wasm.yml index 246e1cbf1..b70fb2ab7 100644 --- a/.github/workflows/cross-wasm.yml +++ b/.github/workflows/cross-wasm.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 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 940cb5f9b..7bf938f91 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@v3 with: - go-version: 1.18 + go-version: 1.19 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/depaware.yml b/.github/workflows/depaware.yml index f383d3960..2021734f7 100644 --- a/.github/workflows/depaware.yml +++ b/.github/workflows/depaware.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Check out code uses: actions/checkout@v3 diff --git a/.github/workflows/go_generate.yml b/.github/workflows/go_generate.yml index 83b8c9df5..d633eed04 100644 --- a/.github/workflows/go_generate.yml +++ b/.github/workflows/go_generate.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Check out code uses: actions/checkout@v3 diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 1f447d36d..2841123c3 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Check out code uses: actions/checkout@v3 diff --git a/.github/workflows/linux-race.yml b/.github/workflows/linux-race.yml index 2cb083496..7fe1e1925 100644 --- a/.github/workflows/linux-race.yml +++ b/.github/workflows/linux-race.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4e6645b7c..4d4c8e2d3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/linux32.yml b/.github/workflows/linux32.yml index 91e7be7eb..db5b189a1 100644 --- a/.github/workflows/linux32.yml +++ b/.github/workflows/linux32.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/staticcheck.yml b/.github/workflows/staticcheck.yml index adf936d8a..a171da488 100644 --- a/.github/workflows/staticcheck.yml +++ b/.github/workflows/staticcheck.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Check out code uses: actions/checkout@v3 diff --git a/.github/workflows/vm.yml b/.github/workflows/vm.yml index 8e982161f..6abec46af 100644 --- a/.github/workflows/vm.yml +++ b/.github/workflows/vm.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Checkout Code uses: actions/checkout@v3 diff --git a/.github/workflows/windows-race.yml b/.github/workflows/windows-race.yml index d9b40be32..483d7759e 100644 --- a/.github/workflows/windows-race.yml +++ b/.github/workflows/windows-race.yml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: 1.18.x + go-version: 1.19.x - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ceabd0009..f6abca9ae 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: 1.18.x + go-version: 1.19.x - name: Checkout code uses: actions/checkout@v3 diff --git a/Makefile b/Makefile index 6707e342c..43ec406a8 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ vet: ./tool/go vet ./... tidy: - ./tool/go mod tidy -compat=1.17 + ./tool/go mod tidy updatedeps: ./tool/go run github.com/tailscale/depaware --update tailscale.com/cmd/tailscaled diff --git a/README.md b/README.md index 6e02e982f..4ce682b77 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,7 @@ If your distro has conventions that preclude the use of `build_dist.sh`, please do the equivalent of what it does in your 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.18) in module mode. It might -work in earlier Go versions or in GOPATH mode, but we're making no -effort to keep those working. +We require the latest Go release, currently Go 1.19. ## Bugs diff --git a/client/tailscale/acl.go b/client/tailscale/acl.go index dd28ef401..f54783768 100644 --- a/client/tailscale/acl.go +++ b/client/tailscale/acl.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package tailscale diff --git a/client/tailscale/devices.go b/client/tailscale/devices.go index 270a974fa..8b1cc25f0 100644 --- a/client/tailscale/devices.go +++ b/client/tailscale/devices.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package tailscale diff --git a/client/tailscale/dns.go b/client/tailscale/dns.go index ee1f968a1..d907961af 100644 --- a/client/tailscale/dns.go +++ b/client/tailscale/dns.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package tailscale diff --git a/client/tailscale/localclient.go b/client/tailscale/localclient.go index 27289b6d0..313d5fe39 100644 --- a/client/tailscale/localclient.go +++ b/client/tailscale/localclient.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package tailscale diff --git a/client/tailscale/required_version.go b/client/tailscale/required_version.go index 186e688d3..484bfc379 100644 --- a/client/tailscale/required_version.go +++ b/client/tailscale/required_version.go @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !go1.18 -// +build !go1.18 +//go:build !go1.19 +// +build !go1.19 package tailscale func init() { - you_need_Go_1_18_to_compile_Tailscale() + you_need_Go_1_19_to_compile_Tailscale() } diff --git a/client/tailscale/routes.go b/client/tailscale/routes.go index 067fb2e20..0f6b83e72 100644 --- a/client/tailscale/routes.go +++ b/client/tailscale/routes.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package tailscale diff --git a/client/tailscale/tailnet.go b/client/tailscale/tailnet.go index 9b3ac188d..e4f052455 100644 --- a/client/tailscale/tailnet.go +++ b/client/tailscale/tailnet.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package tailscale diff --git a/client/tailscale/tailscale.go b/client/tailscale/tailscale.go index 572a8c7c2..98848c861 100644 --- a/client/tailscale/tailscale.go +++ b/client/tailscale/tailscale.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 // Package tailscale contains Go clients for the Tailscale Local API and // Tailscale control plane API. diff --git a/cmd/tailscaled/debug.go b/cmd/tailscaled/debug.go index b269d8e2b..65dd56f7e 100644 --- a/cmd/tailscaled/debug.go +++ b/cmd/tailscaled/debug.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package main diff --git a/cmd/tailscaled/install_darwin.go b/cmd/tailscaled/install_darwin.go index d5d076eb9..96eff7666 100644 --- a/cmd/tailscaled/install_darwin.go +++ b/cmd/tailscaled/install_darwin.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package main diff --git a/cmd/tailscaled/install_windows.go b/cmd/tailscaled/install_windows.go index a1e12ee3f..64832e47c 100644 --- a/cmd/tailscaled/install_windows.go +++ b/cmd/tailscaled/install_windows.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package main diff --git a/cmd/tailscaled/proxy.go b/cmd/tailscaled/proxy.go index e0668fec8..6562d7637 100644 --- a/cmd/tailscaled/proxy.go +++ b/cmd/tailscaled/proxy.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 // HTTP proxy code diff --git a/cmd/tailscaled/required_version.go b/cmd/tailscaled/required_version.go index 540a4854c..dad4c1265 100644 --- a/cmd/tailscaled/required_version.go +++ b/cmd/tailscaled/required_version.go @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !go1.18 -// +build !go1.18 +//go:build !go1.19 +// +build !go1.19 package main func init() { - you_need_Go_1_18_to_compile_Tailscale() + you_need_Go_1_19_to_compile_Tailscale() } diff --git a/cmd/tailscaled/tailscaled.go b/cmd/tailscaled/tailscaled.go index 3ac8f8f2b..9e0f2a0d5 100644 --- a/cmd/tailscaled/tailscaled.go +++ b/cmd/tailscaled/tailscaled.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 // The tailscaled program is the Tailscale client daemon. It's configured // and controlled via the tailscale CLI program. diff --git a/cmd/tailscaled/tailscaled_bird.go b/cmd/tailscaled/tailscaled_bird.go index 97f5d3f5c..c5d526c81 100644 --- a/cmd/tailscaled/tailscaled_bird.go +++ b/cmd/tailscaled/tailscaled_bird.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 && (linux || darwin || freebsd || openbsd) -// +build go1.18 +//go:build go1.19 && (linux || darwin || freebsd || openbsd) +// +build go1.19 // +build linux darwin freebsd openbsd package main diff --git a/cmd/tailscaled/tailscaled_notwindows.go b/cmd/tailscaled/tailscaled_notwindows.go index ee0bd5f16..ea5ee7773 100644 --- a/cmd/tailscaled/tailscaled_notwindows.go +++ b/cmd/tailscaled/tailscaled_notwindows.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !windows && go1.18 -// +build !windows,go1.18 +//go:build !windows && go1.19 +// +build !windows,go1.19 package main // import "tailscale.com/cmd/tailscaled" diff --git a/cmd/tailscaled/tailscaled_windows.go b/cmd/tailscaled/tailscaled_windows.go index 085c5ca0a..36133eea9 100644 --- a/cmd/tailscaled/tailscaled_windows.go +++ b/cmd/tailscaled/tailscaled_windows.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package main // import "tailscale.com/cmd/tailscaled" diff --git a/go.mod b/go.mod index 0c7ef5cde..0339c7559 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module tailscale.com -go 1.18 +go 1.19 require ( filippo.io/mkcert v1.4.3 diff --git a/go.toolchain.rev b/go.toolchain.rev index 39cb964a7..fe68e0032 100644 --- a/go.toolchain.rev +++ b/go.toolchain.rev @@ -1 +1 @@ -effe2d16a9ed6c4fd97361e8090bb22acc221075 +6dca83b256c7decd3dd6706ee47e04f21a0b935c