From f1fbb9393b781240beaec4a698c664c9e0ded22b Mon Sep 17 00:00:00 2001
From: Obijuan <obijuan.cube@gmail.com>
Date: Sun, 16 Jun 2024 13:26:36 +0200
Subject: [PATCH] release-stable: merge osx-arm64 from develop

---
 .github/workflows/release-stable.yml | 36 +++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release-stable.yml b/.github/workflows/release-stable.yml
index 53ca53a5e..f311366b5 100644
--- a/.github/workflows/release-stable.yml
+++ b/.github/workflows/release-stable.yml
@@ -144,13 +144,34 @@ jobs:
       - name: Setup Nodejs version
         uses: actions/setup-node@v3
         with:
-          node-version: '20.1.0'
+          node-version: '21.1.0'
+
       - name: Install npm dependencies
-        run:   npm install --legacy-peer-deps 
+        run: |
+          sed -i '' 's/darwinDependencies/dependencies/g' package.json
+          npm install --legacy-peer-deps 
+
+      # -- TODO REMOVE IT
       - name: Build OSX packages
         run:  | 
           npm run buildOSX
           ls dist/
+
+      - name: Build OSX ARM64 packages
+        env:
+          MACOS_CERTIFICATE: ${{ secrets.APPLE_CERT_DATA }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.APPLE_CERT_PASSWORD }}
+          CODESIGN_ID: ${{ secrets.APPLE_TEAM_ID }}
+          MACOS_KEYCHAIN_PASS: ${{ secrets.LOCAL_KEYCHAIN_PASS }}
+        run: |
+          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+          security create-keychain -p $MACOS_KEYCHAIN_PASS build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p $MACOS_KEYCHAIN_PASS build.keychain
+          security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $MACOS_KEYCHAIN_PASS build.keychain
+          npm run buildOSXARM64
+          ls dist/
           
        # Loading vars from icestudio package.json
       - id: icestudio_json
@@ -158,6 +179,14 @@ jobs:
           content=`tr '\n' ' ' < package.json`
           echo "packageJson=${content}" >> $GITHUB_OUTPUT 
 
+      - name: Sign DMG
+        env:
+          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
+          MACOS_APPLE_UID: ${{ secrets.APPLE_TEAM_ID }}
+        run: |
+          codesign --force --deep --sign ${MACOS_APPLE_UID} dist/icestudio-${ICESTUDIO_VERSION}-osxarm64.dmg -v
+
+
       # ---------------------------------------
       # -- Upload Mac binaries to the release
       # ---------------------------------------
@@ -173,7 +202,8 @@ jobs:
           files: |
             dist/icestudio-${{env.VERSION}}-osx64.dmg
             dist/icestudio-${{env.VERSION}}-osx64.zip
-
+            dist/icestudio-${env.VERSION}-osxarm64.dmg
+          if-no-files-found: error
 
   # Build for ARM 64
   build-arm: