TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-07-28 06:43:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ssh/tailssh: exclude Android from Linux build tags

Browse Source 
As noted in #16048, the ./ssh/tailssh package failed to build on
Android, because GOOS=android also matches the "linux" build
tag. Exclude Android like iOS is excluded from macOS (darwin).

This now works:

    $ GOOS=android go install ./ipn/ipnlocal ./ssh/tailssh

The original PR at #16048 is also fine, but this stops the problem
earlier.

Updates #16048

Change-Id: Ie4a6f6966a012e510c9cb11dd0d1fa88c48fac37
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2025-05-21 20:30:55 -07:00 committed by Brad Fitzpatrick
parent a05924a9e5
commit 7a5af6e6e7
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/test.yml vendored
View File

@ -305,7 +305,7 @@ jobs:
- name: checkout - name: checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: build some - name: build some
run: ./tool/go build ./ipn/... ./wgengine/ ./types/... ./control/controlclient run: ./tool/go build ./ipn/... ./ssh/tailssh ./wgengine/ ./types/... ./control/controlclient
env: env:
GOOS: ios GOOS: ios
GOARCH: arm64 GOARCH: arm64
@ -375,7 +375,7 @@ jobs:
# some Android breakages early. # some Android breakages early.
# TODO(bradfitz): better; see https://github.com/tailscale/tailscale/issues/4482 # TODO(bradfitz): better; see https://github.com/tailscale/tailscale/issues/4482
- name: build some - name: build some
run: ./tool/go install ./net/netns ./ipn/ipnlocal ./wgengine/magicsock/ ./wgengine/ ./wgengine/router/ ./wgengine/netstack ./util/dnsname/ ./ipn/ ./net/netmon ./wgengine/router/ ./tailcfg/ ./types/logger/ ./net/dns ./hostinfo ./version run: ./tool/go install ./net/netns ./ipn/ipnlocal ./wgengine/magicsock/ ./wgengine/ ./wgengine/router/ ./wgengine/netstack ./util/dnsname/ ./ipn/ ./net/netmon ./wgengine/router/ ./tailcfg/ ./types/logger/ ./net/dns ./hostinfo ./version ./ssh/tailssh
env: env:
GOOS: android GOOS: android
GOARCH: arm64 GOARCH: arm64

2
ssh/tailssh/incubator.go
View File

@ -7,7 +7,7 @@
// and groups to the specified `--uid`, `--gid` and `--groups`, and // and groups to the specified `--uid`, `--gid` and `--groups`, and
// then launches the requested `--cmd`. // then launches the requested `--cmd`.
//go:build linux || (darwin && !ios) || freebsd || openbsd //go:build (linux && !android) || (darwin && !ios) || freebsd || openbsd
package tailssh package tailssh

2
ssh/tailssh/incubator_linux.go
View File

@ -1,7 +1,7 @@
// Copyright (c) Tailscale Inc & AUTHORS // Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
//go:build linux //go:build linux && !android
package tailssh package tailssh

2
ssh/tailssh/tailssh.go
View File

@ -1,7 +1,7 @@
// Copyright (c) Tailscale Inc & AUTHORS // Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
//go:build linux || (darwin && !ios) || freebsd || openbsd || plan9 //go:build (linux && !android) || (darwin && !ios) || freebsd || openbsd || plan9
// Package tailssh is an SSH server integrated into Tailscale. // Package tailssh is an SSH server integrated into Tailscale.
package tailssh package tailssh

2
ssh/tailssh/user.go
View File

@ -1,7 +1,7 @@
// Copyright (c) Tailscale Inc & AUTHORS // Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
//go:build linux || (darwin && !ios) || freebsd || openbsd || plan9 //go:build (linux && !android) || (darwin && !ios) || freebsd || openbsd || plan9
package tailssh package tailssh