ci: sign

.github/workflows/alpha.yml

@@ -59,12 +59,6 @@ jobs:
           pnpm i
           pnpm check ${{ matrix.target }}
 
-      - name: Download and install Apple intermediate certificates
-        if: matrix.os == 'macos-latest'
-        run: |
-          curl -O https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer
-          sudo security add-trusted-cert -d -r trustRoot -k ${HOME}/Library/Keychains/login.keychain-db DeveloperIDG2CA.cer
-
       - name: Tauri build
         uses: tauri-apps/tauri-action@v0
         env:
@@ -75,10 +69,9 @@ jobs:
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
           APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          #加入以下内容为提交app到apple认证，当前会报错，已发邮件与apple沟通
-          #APPLE_ID: ${{ secrets.APPLE_ID }}
-          #APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          #APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
         with:
           tagName: alpha
           releaseName: "Clash Verge Rev Alpha"

.github/workflows/release.yml

@@ -56,12 +56,6 @@ jobs:
           pnpm i
           pnpm check ${{ matrix.target }}
 
-      - name: Download and install Apple intermediate certificates
-        if: matrix.os == 'macos-latest'
-        run: |
-          curl -O https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer
-          sudo security add-trusted-cert -d -r trustRoot -k ${HOME}/Library/Keychains/login.keychain-db DeveloperIDG2CA.cer
-
       - name: Tauri build
         uses: tauri-apps/tauri-action@v0
         env:
@@ -69,6 +63,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
         with:
           tagName: v__VERSION__
           releaseName: "Clash Verge Rev v__VERSION__"

src-tauri/src/core/tray.rs

@@ -88,7 +88,7 @@ impl Tray {
                     ),
             ))
             .add_native_item(SystemTrayMenuItem::Separator)
-            .add_item(CustomMenuItem::new("quit", t!("Quit", "退出")).accelerator("CmdOrControl+Q"))
+            .add_item(CustomMenuItem::new("quit", t!("Quit", "退出")))
     }
 
     pub fn update_systray(app_handle: &AppHandle) -> Result<()> {

src/main.tsx

@@ -37,7 +37,7 @@ document.addEventListener("keydown", (event) => {
   }
   if (
     (event.ctrlKey || event.metaKey) &&
-    ["F", "H", "P", "R", "U"].includes(event.key.toUpperCase())
+    ["F", "H", "P", "Q", "R", "U"].includes(event.key.toUpperCase())
   ) {
     event.preventDefault();
   }