all: remove "no 1.18 support" failures

We have worked around the issue in DERP,
so the vanilla Go 1.18 toolchain now works.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
pull/4268/head
Josh Bleecher Snyder 3 years ago committed by Josh Bleecher Snyder
parent 98984c1a9a
commit 77b4fe0afa

@ -181,9 +181,6 @@ func main() {
os.Exit(0) os.Exit(0)
} }
if runtime.GOOS == "darwin" && runtime.Version() == "go1.18" {
log.Fatalf("tailscaled is broken on macOS with go1.18 due to upstream bug https://github.com/golang/go/issues/51759; use 1.18.1+ or Tailscale's Go fork")
}
if runtime.GOOS == "darwin" && os.Getuid() != 0 && !strings.Contains(args.tunname, "userspace-networking") && !args.cleanup { if runtime.GOOS == "darwin" && os.Getuid() != 0 && !strings.Contains(args.tunname, "userspace-networking") && !args.cleanup {
log.SetFlags(0) log.SetFlags(0)
log.Fatalf("tailscaled requires root; use sudo tailscaled (or use --tun=userspace-networking)") log.Fatalf("tailscaled requires root; use sudo tailscaled (or use --tun=userspace-networking)")

@ -15,7 +15,6 @@ import (
"net/http" "net/http"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -93,9 +92,6 @@ func (s *Server) Dial(ctx context.Context, network, address string) (net.Conn, e
// Start connects the server to the tailnet. // Start connects the server to the tailnet.
// Optional: any calls to Dial/Listen will also call Start. // Optional: any calls to Dial/Listen will also call Start.
func (s *Server) Start() error { func (s *Server) Start() error {
if runtime.GOOS == "darwin" && runtime.Version() == "go1.18" {
log.Fatalf("Tailscale is broken on macOS with go1.18 due to upstream bug https://github.com/golang/go/issues/51759; use 1.18.1+ or Tailscale's Go fork")
}
s.initOnce.Do(s.doInit) s.initOnce.Do(s.doInit)
return s.initErr return s.initErr
} }

Loading…
Cancel
Save