Ship all three variations

nshalman · Apr 4, 2024 · 8bbbe97 · 8bbbe97
1 parent 9fd10b5
commit 8bbbe97
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/nshalman-sunos-releases.yml b/.github/workflows/nshalman-sunos-releases.yml
@@ -35,7 +35,9 @@ jobs:
           files: |
             cmd/tailscaled/tailscale.xml
             sha256sums
-            tailscaled-illumos
-            tailscaled-solaris
             tailscale-illumos
             tailscale-solaris
+            tailscaled-illumos
+            tailscaled-solaris
+            tailscaled-plain-illumos
+            tailscaled-plain-solaris
diff --git a/build.sh b/build.sh
@@ -20,12 +20,19 @@ fix_osabi () {
 
 for GOOS in illumos solaris; do
 	export GOOS
+	# Build "box" binary that can be both daemon and client
+	# Continuing to use the same name as before
 	bash -x ./build_dist.sh --box ./cmd/tailscaled
 	fix_osabi tailscaled
 	mv tailscaled{,-${GOOS}}
-        bash -x ./build_dist.sh --box ./cmd/tailscale
-        fix_osabi tailscale
-        mv tailscale{,-${GOOS}
+	# Build plain daemon binary
+	bash -x ./build_dist.sh ./cmd/tailscaled
+	fix_osabi tailscaled
+	mv tailscaled{,-plain-${GOOS}}
+	# Build plain client binary
+	bash -x ./build_dist.sh ./cmd/tailscale
+	fix_osabi tailscale
+	mv tailscale{,-${GOOS}}
 done
 
 ln cmd/tailscaled/tailscale.xml .