From 21f9d31d2a7c38bba667a123fe63898119043d6f Mon Sep 17 00:00:00 2001
From: bunsenstraat <bunsenstraat@gmail.com>
Date: Wed, 27 Mar 2024 09:52:12 +0100
Subject: [PATCH] split mac job

---
 .circleci/config.yml                           | 18 ++++++++----------
 .../ci/update_desktop_release_assets.ts        |  5 +++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8c01364c0c..fe01fc3dc2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -388,6 +388,9 @@ jobs:
     resource_class:
         macos.m1.large.gen1
     working_directory: ~/remix-project
+        parameters:
+      arch:
+        type: string
     steps:
       - checkout
       - attach_workspace:
@@ -435,17 +438,10 @@ jobs:
           command: |
             nvm use 20
             cd apps/remixdesktop
-            yarn installRipGrepMacOXarm64
-            PUBLISH_FOR_PULL_REQUEST='false' USE_HARD_LINKS=false yarn dist --arm64
+            yarn installRipGrepMacOX<< parameters.arch >>
+            PUBLISH_FOR_PULL_REQUEST='false' USE_HARD_LINKS=false yarn dist --<< parameters.arch >>
             cat release/latest-mac.yml
-            cp release/latest-mac.yml release/latest-mac-arm64.yml
-      - run:  
-          command: |
-            nvm use 20
-            cd apps/remixdesktop
-            yarn installRipGrepMacOXx64
-            PUBLISH_FOR_PULL_REQUEST='false' USE_HARD_LINKS=false yarn dist --x64    
-            cat release/latest-mac.yml   
+            cp release/latest-mac.yml release/latest-mac-<< parameters.arch >>.yml 
       - run:
           name: Notarize the app
           command: |
@@ -769,6 +765,8 @@ workflows:
       - test-remixdesktop-mac:
           requires:
             - build-desktop
+          matrix:
+            paramaters: ["arm64", "x64"]
       - build-remixdesktop-windows:
           requires:
             - build-desktop
diff --git a/apps/remix-ide/ci/update_desktop_release_assets.ts b/apps/remix-ide/ci/update_desktop_release_assets.ts
index a83b02b7ac..001f521815 100644
--- a/apps/remix-ide/ci/update_desktop_release_assets.ts
+++ b/apps/remix-ide/ci/update_desktop_release_assets.ts
@@ -173,10 +173,10 @@ async function main() {
   let files = await readReleaseFilesFromLocalDirectory()
 
   try {
-    if (fs.existsSync(path.join(__dirname, '../../../release', 'latest-mac-arm64.yml')) && fs.existsSync(path.join(__dirname, '../../../release', 'latest-mac.yml'))) {
+    if (fs.existsSync(path.join(__dirname, '../../../release', 'latest-mac-arm64.yml')) && fs.existsSync(path.join(__dirname, '../../../release', 'latest-mac-x64.yml'))) {
       // combine the two files
       const macArm64 = fs.readFileSync(path.join(__dirname, '../../../release', 'latest-mac-arm64.yml'), 'utf8')
-      const mac = fs.readFileSync(path.join(__dirname, '../../../release', 'latest-mac.yml'), 'utf8')
+      const mac = fs.readFileSync(path.join(__dirname, '../../../release', 'latest-mac-x64.yml'), 'utf8')
       const parsedMacArm64 = YAML.parse(macArm64)
       const parsedMac = YAML.parse(mac)
       console.log(parsedMacArm64)
@@ -193,6 +193,7 @@ async function main() {
       fs.writeFileSync(path.join(__dirname, '../../../release', 'latest-mac.yml'), newYml)
       // remove the arm64 file
       fs.unlinkSync(path.join(__dirname, '../../../release', 'latest-mac-arm64.yml'))
+      fs.unlinkSync(path.join(__dirname, '../../../release', 'latest-mac-x64.yml'))
     }
   } catch (e) {
     console.log(e)