Merge pull request #588 from alephium/next

Next -> master
alephium · May 27, 2024 · 008dff8 · 008dff8
2 parents 1b8e75e + 93a5f74
commit 008dff8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
@@ -26,9 +26,10 @@ jobs:
           echo '${{ secrets.api_key }}' > ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
           echo '${{ secrets.mac_certs }}' | base64 -d > applecert.p12
 
-      - name: Extract platform name
-        id: get-os
-        run: echo "os=$(echo ${{ matrix.os }} | cut -d- -f1)" >> $GITHUB_OUTPUT
+      - name: Extract args
+        if: startsWith(matrix.os, 'macos')
+        id: get-args
+        run: echo "args=--universal" >> $GITHUB_OUTPUT
         shell: bash
 
       - name: Install Snapcraft
@@ -40,12 +41,13 @@ jobs:
         if: ${{ startsWith(github.ref, 'refs/tags/alephium-desktop-wallet@') }}
         with:
           package_root: 'apps/desktop-wallet'
-          build_script_name: 'ci:build:electron:${{ steps.get-os.outputs.os }}'
+          build_script_name: 'ci:build'
           is_monorepo: true
           release: true
           github_token: ${{ secrets.github_token }}
           mac_certs: ${{ secrets.MAC_CERTS }}
           mac_certs_password: ${{ secrets.MAC_CERTS_PASSWORD }}
+          args: ${{ steps.get-args.outputs.args }}
         env:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}

diff --git a/apps/desktop-wallet/package.json b/apps/desktop-wallet/package.json
@@ -1,7 +1,7 @@
 {
   "name": "alephium-desktop-wallet",
   "description": "The official Alephium wallet",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "author": "Alephium dev <dev@alephium.org>",
   "main": "public/electron.js",
   "homepage": "./",
@@ -21,6 +21,7 @@
     "ci:build:electron:ubuntu": "turbo run build:electron:ubuntu",
     "ci:build:electron:windows": "turbo run build:electron:windows",
     "ci:build:electron:macos": "turbo run build:electron:macos",
+    "ci:build": "turbo run build",
     "preview": "vite preview",
     "test": "vitest run",
     "test:watch": "vitest watch",
@@ -181,6 +182,7 @@
     },
     "mac": {
       "hardenedRuntime": true,
+      "defaultArch": "universal",
       "entitlements": "../../node_modules/electron-builder-notarize/entitlements.mac.inherit.plist"
     },
     "directories": {