From a965f2360e96ac546630d9c91ff80ea7817d7c44 Mon Sep 17 00:00:00 2001
From: Service Account <service@jan.ai>
Date: Wed, 25 Oct 2023 13:39:27 +0700
Subject: [PATCH] Move back to github-hosted runner

---
 .github/workflows/jan-electron-build.yml | 18 +++++++++---------
 .github/workflows/jan-plugins.yml        | 16 ++++++++++++++--
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/jan-electron-build.yml b/.github/workflows/jan-electron-build.yml
index 3783ebd9a..c6a2df1b9 100644
--- a/.github/workflows/jan-electron-build.yml
+++ b/.github/workflows/jan-electron-build.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build-macos:
-    runs-on: macos-silicon
+    runs-on: macos-latest
     environment: production
     permissions:
       contents: write
@@ -43,11 +43,11 @@ jobs:
         env:
           CODE_SIGN_P12_BASE64: ${{ secrets.CODE_SIGN_P12_BASE64 }}
 
-      # - uses: apple-actions/import-codesign-certs@v2
-      #   continue-on-error: true
-      #   with:
-      #     p12-file-base64: ${{ secrets.CODE_SIGN_P12_BASE64 }}
-      #     p12-password: ${{ secrets.CODE_SIGN_P12_PASSWORD }}
+      - uses: apple-actions/import-codesign-certs@v2
+        continue-on-error: true
+        with:
+          p12-file-base64: ${{ secrets.CODE_SIGN_P12_BASE64 }}
+          p12-password: ${{ secrets.CODE_SIGN_P12_PASSWORD }}
 
       - name: Install yarn dependencies
         run: |
@@ -62,9 +62,9 @@ jobs:
           yarn build:publish-darwin
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # CSC_LINK: "/tmp/codesign.p12"
-          # CSC_KEY_PASSWORD: ${{ secrets.CODE_SIGN_P12_PASSWORD }}
-          # CSC_IDENTITY_AUTO_DISCOVERY: "true"
+          CSC_LINK: "/tmp/codesign.p12"
+          CSC_KEY_PASSWORD: ${{ secrets.CODE_SIGN_P12_PASSWORD }}
+          CSC_IDENTITY_AUTO_DISCOVERY: "true"
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
 
diff --git a/.github/workflows/jan-plugins.yml b/.github/workflows/jan-plugins.yml
index 6edd168b3..e60685410 100644
--- a/.github/workflows/jan-plugins.yml
+++ b/.github/workflows/jan-plugins.yml
@@ -15,7 +15,7 @@ on:
       - "!plugins/*/package.json"
 jobs:
   build:
-    runs-on: macos-silicon
+    runs-on: macos-latest
     environment: production
     outputs:
       branch_name: ${{ steps.commit_and_tag.outputs.branch_name }}
@@ -27,7 +27,19 @@ jobs:
 
       - name: Install jq
         uses: dcarbone/install-jq-action@v2.0.1
-    
+
+      - name: Get Cer for code signing
+        run: base64 -d <<< "$CODE_SIGN_P12_BASE64" > /tmp/codesign.p12
+        shell: bash
+        env:
+          CODE_SIGN_P12_BASE64: ${{ secrets.CODE_SIGN_P12_BASE64 }}
+
+      - uses: apple-actions/import-codesign-certs@v2
+        continue-on-error: true
+        with:
+          p12-file-base64: ${{ secrets.CODE_SIGN_P12_BASE64 }}
+          p12-password: ${{ secrets.CODE_SIGN_P12_PASSWORD }}
+
       - name: Check Path Change
         run: |
           git config --global user.email "service@jan.ai"