From 40314b3165834ace9c54aee99abea37ef4d95da6 Mon Sep 17 00:00:00 2001
From: Hippie Hacker <hh@ii.coop>
Date: Mon, 8 May 2023 20:07:11 +0000
Subject: [PATCH 1/3] Add tunnel and tunneld binaries for other platforms

---
 .github/workflows/release.yaml | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 3799e33..155b0d8 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -57,7 +57,31 @@ jobs:
           go mod download
 
           make clean
-          make -j build/tunneld build/tunneld.tag
+          GOOS=darwin GOARCH=arm64 make build
+          mv build/tunneld tunneld-darwin-arm64
+          mv build/tunnel tunnel-darwin-arm64
+          make clean
+          GOOS=darwin GOARCH=amd64 make build
+          mv build/tunneld tunneld-darwin-amd64
+          mv build/tunnel tunnel-darwin-amd64
+          make clean
+          GOOS=linux GOARCH=arm GOARM=7 make build
+          mv build/tunneld tunneld-linux-armv7
+          mv build/tunnel tunnel-linux-armv7
+          make clean
+          GOOS=linux GOARCH=arm64 make build
+          mv build/tunneld tunneld-linux-arm64
+          mv build/tunnel tunnel-linux-arm64
+          make clean
+          GOOS=linux GOARCH=amd64 make build
+          mv build/tunneld tunneld-linux-amd64
+          mv build/tunnel tunnel-linux-amd64
+          make clean
+          GOOS=windows GOARCH=amd64 make build
+          mv build/tunneld tunneld-windows-amd64
+          mv build/tunnel tunnel-linux-amd64
+          make clean
+          make -j tunneld build/tunneld.tag
 
           image_tag=$(cat build/tunneld.tag)
           if [[ "$image_tag" == "" ]]; then
@@ -96,5 +120,11 @@ jobs:
         with:
           name: release-artifacts
           path: |
-            ./build/tunneld
+            ./tunnel-darwin-amd64
+            ./tunnel-darwin-arm64
+            ./tunnel-linux-arm64
+            ./tunnel-linux-amd64
+            ./tunnel-linux-armv7
+            ./tunnel-windows-arm64
+            ./tunnel-windows-amd64
           retention-days: 7

From 4f84be9c16347ad2273bb1e076945c80f522f461 Mon Sep 17 00:00:00 2001
From: Hippie Hacker <hh@ii.coop>
Date: Mon, 8 May 2023 20:39:43 +0000
Subject: [PATCH 2/3] Don't build docker, upload artifacts please

---
 .github/workflows/release.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 155b0d8..e61d510 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -91,17 +91,17 @@ jobs:
 
           echo "docker_tag=${image_tag}" >> $GITHUB_OUTPUT
 
-      - name: Push Docker image
-        if: ${{ !github.event.inputs.dry_run && !github.event.inputs.snapshot }}
-        run: |
-          set -euxo pipefail
+      # - name: Push Docker image
+      #   if: ${{ !github.event.inputs.dry_run && !github.event.inputs.snapshot }}
+      #   run: |
+      #     set -euxo pipefail
 
-          image_tag="${{ steps.build.outputs.docker_tag }}"
-          docker push "$image_tag"
+      #     image_tag="${{ steps.build.outputs.docker_tag }}"
+      #     docker push "$image_tag"
 
-          latest_tag="ghcr.io/coder/wgtunnel/tunneld:latest"
-          docker tag "$image_tag" "$latest_tag"
-          docker push "$latest_tag"
+      #     latest_tag="ghcr.io/coder/wgtunnel/tunneld:latest"
+      #     docker tag "$image_tag" "$latest_tag"
+      #     docker push "$latest_tag"
 
       - name: ls build
         run: ls -lh build
@@ -110,7 +110,7 @@ jobs:
         if: ${{ !github.event.inputs.dry_run && !github.event.inputs.snapshot }}
         uses: ncipollo/release-action@v1
         with:
-          artifacts: "build/tunneld"
+          artifacts: "tunnel-*-*"
           body: "Docker image: `${{ steps.build.outputs.docker_tag }}`"
           token: ${{ secrets.GITHUB_TOKEN }}
 

From ff6ebf9129165a42fbf9e0428bd31c8aa597bca1 Mon Sep 17 00:00:00 2001
From: Hippie Hacker <hh@ii.coop>
Date: Tue, 9 May 2023 16:11:25 +0000
Subject: [PATCH 3/3] Ensure we release tunneld + tunnel binaries

---
 .github/workflows/release.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index e61d510..d651f66 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -110,7 +110,7 @@ jobs:
         if: ${{ !github.event.inputs.dry_run && !github.event.inputs.snapshot }}
         uses: ncipollo/release-action@v1
         with:
-          artifacts: "tunnel-*-*"
+          artifacts: "tunnel*-*-*"
           body: "Docker image: `${{ steps.build.outputs.docker_tag }}`"
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -120,6 +120,13 @@ jobs:
         with:
           name: release-artifacts
           path: |
+            ./tunneld-darwin-amd64
+            ./tunneld-darwin-arm64
+            ./tunneld-linux-arm64
+            ./tunneld-linux-amd64
+            ./tunneld-linux-armv7
+            ./tunneld-windows-arm64
+            ./tunneld-windows-amd64
             ./tunnel-darwin-amd64
             ./tunnel-darwin-arm64
             ./tunnel-linux-arm64