From 157841e9145d0f4119c33227b28d41e8a3ff923b Mon Sep 17 00:00:00 2001
From: James Saryerwinnie <js@jamesls.com>
Date: Wed, 29 Sep 2021 15:05:01 -0400
Subject: [PATCH] Add ARM64 builds for MacOS

Also updated the GitHub action to run the `build-all-platforms`
script as part of CI.
---
 .github/workflows/run-tests.yml | 15 +++++++++++++++
 scripts/build-all-platforms     | 17 +++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index f9d8ac9..bdb3f22 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -18,3 +18,18 @@ jobs:
         go-version: ${{ matrix.go-version }}
     - name: Build and test
       run: make
+  build-all-platforms:
+    name: Build all platforms
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest]
+        go-version: [1.17]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ${{ matrix.go-version }}
+    - name: Build all supported platforms
+      run: JP_VERSION=100.100.100 ./scripts/build-all-platforms
diff --git a/scripts/build-all-platforms b/scripts/build-all-platforms
index 43d9cb2..540a842 100755
--- a/scripts/build-all-platforms
+++ b/scripts/build-all-platforms
@@ -6,6 +6,7 @@ then
 fi
 go get ./...
 rm -rf ./build/jp-*
+# All builds for 386/amd64.
 for goos in darwin linux windows freebsd; do
 	export GOOS="$goos"
 	for goarch in 386 amd64; do
@@ -14,18 +15,22 @@ for goos in darwin linux windows freebsd; do
 		go build -v -o build/jp-$GOOS-$GOARCH 2>/dev/null
 	done
 done
-# Also build for ARM7/linux
-export GOOS=linux
+# Now handle ARM builds.
+# First handle 32bit builds separately
 export GOARCH=arm
 export GOARM=7
+export GOOS=linux
 echo "Building for $GOOS/$GOARCH/$GOARM"
 go build -v -o build/jp-$GOOS-$GOARCH-arm$GOARM 2> /dev/null
-# Also build for ARM64/linux
-export GOOS=linux
+# Now handled supported ARM64 builds.
 export GOARCH=arm64
-echo "Building for $GOOS/$GOARCH"
-go build -v -o build/jp-$GOOS-$GOARCH 2> /dev/null
+for goos in linux darwin; do
+	export GOOS="$goos"
+	echo "Building for $GOOS/$GOARCH"
+	go build -v -o build/jp-$GOOS-$GOARCH 2>/dev/null
+done
 # And finally we'll create a .tar.gz version for homebrew users.
+# We'll neend to figure out how to deal with M1 macbooks in the future.
 cp build/jp-darwin-amd64 build/jp
 cd build
 tar cvfz jp-$JP_VERSION.tar.gz jp