From a45af6c7b6bcd3e23259117484e5ce4ea93308da Mon Sep 17 00:00:00 2001
From: Kevin Meziere <kevinmeziere@users.noreply.github.com>
Date: Fri, 2 Feb 2024 12:19:49 -0800
Subject: [PATCH] build tailscale client

---
 .github/workflows/cross-illumos.yaml          |  4 ++--
 .github/workflows/nshalman-sunos-releases.yml |  8 ++++++--
 build.sh                                      | 14 ++++++++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cross-illumos.yaml b/.github/workflows/cross-illumos.yaml
index fea55f566c367..a328084cf0cfa 100644
--- a/.github/workflows/cross-illumos.yaml
+++ b/.github/workflows/cross-illumos.yaml
@@ -17,12 +17,12 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
           check-latest: true
diff --git a/.github/workflows/nshalman-sunos-releases.yml b/.github/workflows/nshalman-sunos-releases.yml
index 6dfd070dbf8b2..15a942e6faeec 100644
--- a/.github/workflows/nshalman-sunos-releases.yml
+++ b/.github/workflows/nshalman-sunos-releases.yml
@@ -13,12 +13,12 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
           check-latest: true
@@ -35,5 +35,9 @@ jobs:
           files: |
             cmd/tailscaled/tailscale.xml
             sha256sums
+            tailscale-illumos
+            tailscale-solaris
             tailscaled-illumos
             tailscaled-solaris
+            tailscaled-plain-illumos
+            tailscaled-plain-solaris
diff --git a/build.sh b/build.sh
index 763eede65a338..b051890d85d9f 100755
--- a/build.sh
+++ b/build.sh
@@ -20,11 +20,21 @@ fix_osabi () {
 
 for GOOS in illumos solaris; do
 	export GOOS
-	bash -x ./build_dist.sh --box ./cmd/tailscaled
+	# Build "box" binary that can be both daemon and client
+	# Continuing to use the same name as before
+	bash -x ./build_dist.sh --extra-small --box ./cmd/tailscaled
 	fix_osabi tailscaled
 	mv tailscaled{,-${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 .
-shasum -a 256 tailscaled-* tailscale.xml >sha256sums
+shasum -a 256 tailscaled-* tailscale-* tailscale.xml >sha256sums
 rm ./tailscale.xml