From 59116a8886638ee9592155eede4d0224748899aa Mon Sep 17 00:00:00 2001
From: Rinse <rinse12@tutanota.com>
Date: Wed, 27 Nov 2024 10:55:04 +0000
Subject: [PATCH] ci(macos): upload tarballs for both macos x64 and arm64

---
 .github/workflows/CI-release.yml | 14 ++++++++------
 bin/install.sh                   |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/CI-release.yml b/.github/workflows/CI-release.yml
index 5647b16..6b3b47b 100644
--- a/.github/workflows/CI-release.yml
+++ b/.github/workflows/CI-release.yml
@@ -44,10 +44,13 @@ jobs:
           tag: ${{ steps.previoustag.outputs.tag }}
           overwrite: true
 
-  generate-upload-tarballs-macos-x64:
-    name: Generate and upload tarballs for Macos x64
+  generate-upload-tarballs-macos-x64-arm64:
+    name: Generate and upload tarballs for Macos (x64 + arm64)
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    runs-on: macos-latest # should use x64 arch
+    runs-on: macos-latest # will use arm64
+    strategy:
+      matrix:
+        arch: [x64, arm64]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -69,7 +72,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Generate tarballs
-        run: yarn generate:executable:tarballs:macos:x64
+        run: yarn generate:executable:tarballs:macos:${{ matrix.arch }}
       - name: Rename tarballs and installers
         run: yarn ci:rename-tarballs
       - name: Upload tarballs to release
@@ -79,7 +82,6 @@ jobs:
           file_glob: true
           tag: ${{ steps.previoustag.outputs.tag }}
           overwrite: true
-    
 
   generate-upload-windows-installers:
     name: Generate and upload windows installers
@@ -109,7 +111,7 @@ jobs:
         run: yarn generate:installer:windows
         shell: bash
       # You can't use oclif pack on windows, so we're skipping it for now
-      # - name: Generate Windows tarballs 
+      # - name: Generate Windows tarballs
       #   run: yarn generate:executable:tarballs:windows
       - name: Rename tarballs and installers
         run: yarn ci:rename-tarballs
diff --git a/bin/install.sh b/bin/install.sh
index 2a988bf..2aae6e4 100644
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -5,7 +5,7 @@ set -e
 
 case $(uname -sm) in
 	"Darwin x86_64") suffix="darwin-x64" ;;
-	"Darwin arm64") suffix="darwin-x64" ;; 
+	"Darwin arm64") suffix="darwin-arm64" ;; 
 	"Linux aarch64") suffix="linux-arm64" ;;
   "Linux x86_64") suffix="linux-x64" ;;
 	*) suffix="no-file-name" ;;