summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJames Tucker <james@tailscale.com>2022-04-21 09:58:54 -0700
committerJames Tucker <james@tailscale.com>2022-04-21 10:26:40 -0700
commit20cd69097096ddfebd3b21c0d15d71d26e528186 (patch)
tree34e0bd7fac0f269f82171d63b803ccaa94b5c3e5
parent26fe00e7bd25f8fde4b70c146f483e60f38bd87a (diff)
downloadtailscale-cross-android.tar.xz
tailscale-cross-android.zip
.github/workflows: add cross-androidcross-android
Fixes 4482 Signed-off-by: James Tucker <james@tailscale.com>
-rw-r--r--.github/workflows/cross-android.yml4
-rw-r--r--wgengine/monitor/monitor_linux_test.go3
2 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/cross-android.yml b/.github/workflows/cross-android.yml
index d7a1b1024..dc9549fac 100644
--- a/.github/workflows/cross-android.yml
+++ b/.github/workflows/cross-android.yml
@@ -31,11 +31,11 @@ jobs:
GOARCH: amd64
run: go build ./cmd/...
- - name: Android build tests
+ - name: Android build tests (does not run tests)
env:
GOOS: android
GOARCH: amd64
- run: for d in $(go list -f '{{if .TestGoFiles}}{{.Dir}}{{end}}' ./... ); do (echo $d; cd $d && go test -c ); done
+ run: for d in $(go list -f '{{if .TestGoFiles}}{{.Dir}}{{end}}' ./... ); do (echo $d; cd $d && go test -run '^$' -c ); done
- uses: k0kubun/action-slack@v2.0.0
with:
diff --git a/wgengine/monitor/monitor_linux_test.go b/wgengine/monitor/monitor_linux_test.go
index 25bad943f..7d42ff07a 100644
--- a/wgengine/monitor/monitor_linux_test.go
+++ b/wgengine/monitor/monitor_linux_test.go
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+//go:build !android
+// +build !android
+
package monitor
import (