r0b08x [chore] 5/21/2024, 8:32:19 AM

patrikx3 · May 21, 2024 · 2b0d9e3 · 2b0d9e3
1 parent 859b3e9
commit 2b0d9e3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml
@@ -24,18 +24,31 @@ jobs:
       - name: Install dependencies
         run: npm install
 
-      - name: Decode and Install Certificates
+      - name: Decode certificates and profiles
+        run: |
+          echo "${{ secrets.MAS_CERTIFICATE_P12 }}" | base64 --decode > mac_app.p12
+          echo "${{ secrets.MAS_INSTALLER_CERTIFICATE_P12 }}" | base64 --decode > mac_installer.p12
+          echo "${{ secrets.MAS_PROVISIONING_PROFILE }}" | base64 --decode > p3xredisui.provisionprofile
+          echo "${{ secrets.CERTIFICATE_P12_BASE64 }}" | base64 --decode > certificate.p12
+      - name: Install Certificate
+        run: |
+          security create-keychain -p actions build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p actions build.keychain
+          security import mac_app.p12 -k build.keychain -P "$MAS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
+          security import mac_installer.p12 -k build.keychain -P "$MAS_INSTALLER_CERTIFICATE_PASSWORD" -T /usr/bin/productsign
+          security import certificate.p12 -k build.keychain -P "$CERTIFICATE_P12_PASSWORD" -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple: -s -k actions build.keychain
         env:
           CERTIFICATE_P12_BASE64: ${{ secrets.CERTIFICATE_P12_BASE64 }}
           CERTIFICATE_P12_PASSWORD: ${{ secrets.CERTIFICATE_P12_PASSWORD }}
+          MAS_CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_P12_PASSWORD }}
+          MAS_INSTALLER_CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_P12_PASSWORD }}
+
+      - name: Setup Provisioning Profile
         run: |
-          echo $CERTIFICATE_P12_BASE64 | base64 --decode > certificate.p12
-          security create-keychain -p actions temp.keychain
-          security import certificate.p12 -k ~/Library/Keychains/temp.keychain -P "$CERTIFICATE_P12_PASSWORD" -T /usr/bin/codesign
-          security list-keychains -s temp.keychain
-          security default-keychain -s temp.keychain
-          security unlock-keychain -p actions temp.keychain
-          security set-key-partition-list -S apple-tool:,apple: -s -k actions temp.keychain
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp p3xredisui.provisionprofile ~/Library/MobileDevice/Provisioning\ Profiles/
 
       - name: Build and package macOS app
         env:

diff --git a/package.json b/package.json
@@ -124,19 +124,19 @@
             "icon": "../src/electron/images/",
             "target": "appimage"
         },
-        "mac": {        
+        "mac": {
+
             "category": "public.app-category.developer-tools",
             "hardenedRuntime": true,
-            "icon": "artifacts/apple/icons/redis.icns",
             "gatekeeperAssess": false,
             "identity": "Patrik László (3GB3S9SH84)",           
-            "type": "distribution",
             "extendInfo": {
                 "ElectronTeamID": "3GB3S9SH84"
             },
             "notarize": {
                 "teamId": "3GB3S9SH84"
             },
+            "type": "distribution",
             "target": [
                 {
                     "target": "mas",