ci

drl990114 · Jan 6, 2024 · 6661977 · 6661977
1 parent 7b7e749
commit 6661977
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/tauri-release-test.yml b/.github/workflows/tauri-release-test.yml
@@ -2,8 +2,8 @@ name: Release
 
 on:
   push:
-    branches:
-      - 'feat/updater'
+    tags:
+      - 'v*'
 
 jobs:
   build:
@@ -80,7 +80,8 @@ jobs:
         run: yarn build:desktop --target ${{ matrix.target }}
         env:
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
 
       - uses: actions/upload-artifact@v3
@@ -127,12 +128,13 @@ jobs:
           name: artifacts-aarch64
           path: artifacts/aarch64
 
+      # There are currently no certified Apple developers, but aarch64 will not be installed because of this.
+      # For now, use the x64 version instead of aarch64.
       - name: Rename artifacts
         run: |
-          mkdir -p "artifacts/release"
-          mv "artifacts/aarch64/dmg/MarkFlowy_${{ env.version }}_aarch64.dmg" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.dmg"
-          mv "artifacts/aarch64/macos/MarkFlowy.app.tar.gz" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.app.tar.gz"
-          mv "artifacts/aarch64/macos/MarkFlowy.app.tar.gz.sig" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.app.tar.gz.sig"
+          cp -r  "artifacts/x86_64/dmg/MarkFlowy_${{ env.version }}_x64.dmg" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.dmg"
+          cp -r  "artifacts/x86_64/macos/MarkFlowy.app.tar.gz" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.app.tar.gz"
+          cp -r  "artifacts/x86_64/macos/MarkFlowy.app.tar.gz.sig" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.app.tar.gz.sig"
 
           mv "artifacts/x86_64/dmg/MarkFlowy_${{ env.version }}_x64.dmg" "artifacts/MarkFlowy_${{ env.version }}_macos_x86_64.dmg"
           mv "artifacts/x86_64/macos/MarkFlowy.app.tar.gz" "artifacts/MarkFlowy_${{ env.version }}_macos_x86_64.app.tar.gz"
@@ -156,7 +158,7 @@ jobs:
           releaseBody: v${{ env.version }}
           releaseDraft: false
           prerelease: true
-          files: ./artifacts/release/*
+           files: ./artifacts/**/*
 
   updater:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/tauri-release.yml b/.github/workflows/tauri-release.yml
@@ -1,10 +1,5 @@
 name: Release
 
-on:
-  push:
-    tags:
-      - 'v*'
-
 jobs:
   build:
     permissions:

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -5,6 +5,7 @@
     "dev": "vite --host",
     "build": "tsc && vite build",
     "build:types": "tsc --tsconfig ./tsconfig.types.json",
+    "updater": "tr updater",
     "preview": "vite preview",
     "tauri:build": "tauri build",
     "tauri:dev": "tauri dev",

diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "MarkFlowy",
-    "version": "0.6.0"
+    "version": "0.7.1"
   },
   "plugins": {
     "shell": {
@@ -39,7 +39,7 @@
       "targets": "all",
       "updater": {
         "active": true,
-        "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEY3NjFEN0QxOEZBQjBDMjYKUldRbURLdVAwZGRoOTJjUHZVbWM1elVJcXNpVU5rSHBvbmNWbU5WZXdoUE51RXRKMFRTVTZCZlcK",
+        "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDg3M0ZEQUYyOEMyNjVCNTIKUldSU1d5YU04dG8vaDFTemY1RVdrTWNNTUdvMlQ3K05nMnJSQzc5cldQZXM4N2N1ejF3UnJsM1kK",
         "windows": {
           "installMode": "passive"
         }