From 740581cccbe42a6e5071fbba24252c2752016ce2 Mon Sep 17 00:00:00 2001
From: Chidi Williams <williamschidi1@gmail.com>
Date: Thu, 19 Jan 2023 22:15:09 +0000
Subject: [PATCH] Add ARM build

---
 .github/workflows/ci.yml | 20 ++++++++++----------
 Makefile                 | 17 +++++++++++------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index def7c46a..048ac70e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -235,16 +235,16 @@ jobs:
       #          timeoutSeconds: 1800 # 30 minutes
       #          intervalSeconds: 30
 
-      - name: Download artifacts
-        #        if: steps.wait-for-build.outputs.conclusion == 'success'
-        run: |
-          wget -q -O $RUNNER_TEMP/buzz.zip https://api.cirrus-ci.com/v1/artifact/github/chidiwilliams/buzz/Build/buzz.zip?branch=$GITHUB_HEAD_REF
-          unzip $RUNNER_TEMP/buzz.zip -d $RUNNER_TEMP/buzz-zip
-          ZIP_FILE_PATH=$(find $RUNNER_TEMP/buzz-zip/dist/Buzz-*-mac.zip)
-          ditto -x -k $ZIP_FILE_PATH $RUNNER_TEMP/buzz-zip
-          cp $RUNNER_TEMP/buzz-zip/Buzz.app/Contents/Resources/whisper_cpp .
-          cp $RUNNER_TEMP/buzz-zip/Buzz.app/Contents/Resources/libwhisper.dylib .
-          cp $RUNNER_TEMP/buzz-zip/buzz/whisper_cpp.py buzz
+      #      - name: Download artifacts
+      #        #        if: steps.wait-for-build.outputs.conclusion == 'success'
+      #        run: |
+      #          wget -q -O $RUNNER_TEMP/buzz.zip https://api.cirrus-ci.com/v1/artifact/github/chidiwilliams/buzz/Build/buzz.zip?branch=$GITHUB_HEAD_REF
+      #          unzip $RUNNER_TEMP/buzz.zip -d $RUNNER_TEMP/buzz-zip
+      #          ZIP_FILE_PATH=$(find $RUNNER_TEMP/buzz-zip/dist/Buzz-*-mac.zip)
+      #          ditto -x -k $ZIP_FILE_PATH $RUNNER_TEMP/buzz-zip
+      #          cp $RUNNER_TEMP/buzz-zip/Buzz.app/Contents/Resources/whisper_cpp .
+      #          cp $RUNNER_TEMP/buzz-zip/Buzz.app/Contents/Resources/libwhisper.dylib .
+      #          cp $RUNNER_TEMP/buzz-zip/buzz/whisper_cpp.py buzz
 
       - name: Bundle
         #        if: steps.wait-for-build.outputs.conclusion == 'success'
diff --git a/Makefile b/Makefile
index 1a249a89..79397c12 100644
--- a/Makefile
+++ b/Makefile
@@ -75,12 +75,17 @@ else
 endif
 
 $(LIBWHISPER) whisper_cpp:
-	cmake -S whisper.cpp -B whisper.cpp/build/ $(CMAKE_FLAGS)
-	cmake --build whisper.cpp/build --verbose
-	cp whisper.cpp/build/bin/Debug/$(LIBWHISPER) . || true
-	cp whisper.cpp/build/bin/Debug/main whisper_cpp || true
-	cp whisper.cpp/build/$(LIBWHISPER) . || true
-	cp whisper.cpp/build/bin/main whisper_cpp || true
+	if [ $(UNAME_S) = "Darwin" ] && [ $(MAC_TYPE) = "arm64" ]; then \
+		cp bin/macos_arm64/libwhisper.dylib .; \
+		cp bin/macos_arm64/whisper_cpp .; \
+	else \
+		cmake -S whisper.cpp -B whisper.cpp/build/ $(CMAKE_FLAGS); \
+		cmake --build whisper.cpp/build --verbose; \
+		cp whisper.cpp/build/bin/Debug/$(LIBWHISPER) . || true; \
+		cp whisper.cpp/build/bin/Debug/main whisper_cpp || true; \
+		cp whisper.cpp/build/$(LIBWHISPER) . || true; \
+		cp whisper.cpp/build/bin/main whisper_cpp || true; \
+  	fi
 
 buzz/whisper_cpp.py: $(LIBWHISPER)
 	ctypesgen ./whisper.cpp/whisper.h -l$(LIBWHISPER) -o buzz/whisper_cpp.py