TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-05-04 14:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: use cibuild.On

Browse Source 
Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2022-03-18 14:46:38 -07:00 committed by Josh Bleecher Snyder
parent b775df0b57
commit 32fd42430b
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssh/tailssh/tailssh_test.go
View File

@ -26,6 +26,7 @@ import (
"tailscale.com/net/tsdial" "tailscale.com/net/tsdial"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/types/logger" "tailscale.com/types/logger"
"tailscale.com/util/cibuild"
"tailscale.com/util/lineread" "tailscale.com/util/lineread"
"tailscale.com/wgengine" "tailscale.com/wgengine"
) )
@ -245,9 +246,7 @@ func TestSSH(t *testing.T) {
} }
t.Run("env", func(t *testing.T) { t.Run("env", func(t *testing.T) {
if os.Getenv("CI") == "true" { if cibuild.On() {
// CI env variable is set by GitHub.
// https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
t.Skip("Skipping for now; see https://github.com/tailscale/tailscale/issues/4051") t.Skip("Skipping for now; see https://github.com/tailscale/tailscale/issues/4051")
} }
cmd := execSSH("LANG=foo env") cmd := execSSH("LANG=foo env")
@ -292,9 +291,7 @@ func TestSSH(t *testing.T) {
}) })
t.Run("stdin", func(t *testing.T) { t.Run("stdin", func(t *testing.T) {
if os.Getenv("CI") == "true" { if cibuild.On() {
// CI env variable is set by GitHub.
// https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
t.Skip("Skipping for now; see https://github.com/tailscale/tailscale/issues/4051") t.Skip("Skipping for now; see https://github.com/tailscale/tailscale/issues/4051")
} }
cmd := execSSH("cat") cmd := execSSH("cat")

4
tstest/archtest/qemu_test.go
View File

@ -16,6 +16,8 @@ import (
"runtime" "runtime"
"strings" "strings"
"testing" "testing"
"tailscale.com/util/cibuild"
) )
func TestInQemu(t *testing.T) { func TestInQemu(t *testing.T) {
@ -33,7 +35,7 @@ func TestInQemu(t *testing.T) {
{"mips64le", "mips64el"}, {"mips64le", "mips64el"},
{"386", "386"}, {"386", "386"},
} }
inCI := os.Getenv("CI") == "true" inCI := cibuild.On()
for _, arch := range arches { for _, arch := range arches {
arch := arch arch := arch
t.Run(arch.Goarch, func(t *testing.T) { t.Run(arch.Goarch, func(t *testing.T) {

4
util/cibuild/cibuild.go
View File

@ -9,5 +9,7 @@ import "os"
// On reports whether the current binary is executing on a CI system. // On reports whether the current binary is executing on a CI system.
func On() bool { func On() bool {
return os.Getenv("GITHUB_ACTIONS") != "" // CI env variable is set by GitHub.
// https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
return os.Getenv("GITHUB_ACTIONS") != "" || os.Getenv("CI") == "true"
} }