Windows on ARM working

.github/workflows/publish.yml

@@ -24,7 +24,6 @@ on:
         type: boolean
 
 env:
-  CN_APPLICATION: cap/cap
   APP_CARGO_TOML: apps/desktop/src-tauri/Cargo.toml
   SENTRY_ORG: cap-s2
   SENTRY_PROJECT: cap-desktop
@@ -35,7 +34,6 @@ jobs:
     outputs:
       version: ${{ steps.read_version.outputs.value }}
       needs_release: ${{ steps.create_tag.outputs.tag_existed != 'true' }}
-      cn_release_stdout: ${{ steps.create_cn_release.outputs.stdout }}
       gh_release_url: ${{ steps.create_gh_release.outputs.url }}
     permissions:
       contents: write
@@ -100,13 +98,6 @@ jobs:
 
             await main();
 
-      - name: Create draft CN release
-        id: create_cn_release
-        uses: crabnebula-dev/cloud-release@v0
-        with:
-          command: release draft ${{ env.CN_APPLICATION }} ${{ steps.read_version.outputs.value }} --framework tauri
-          api-key: ${{ secrets.CN_API_KEY }}
-
       - name: Create draft GH release
         id: create_gh_release
         # TODO: Change to stable version when available
@@ -124,7 +115,6 @@ jobs:
           script: |
             async function main() {
               const token = await core.getIDToken("cap-discord-bot");
-              const cnReleaseId = JSON.parse(`${{ steps.create_cn_release.outputs.stdout }}`).id;
 
               const resp = await fetch(
                 "https://cap-discord-bot.brendonovich.workers.dev/github-workflow",
@@ -136,7 +126,6 @@ jobs:
                     version: "${{ steps.read_version.outputs.value }}",
                     releaseUrl: "${{ steps.create_gh_release.outputs.url }}",
                     interactionId: "${{ inputs.interactionId }}",
-                    cnReleaseId,
                   }),
                   headers: {
                     "Content-Type": "application/json",
@@ -171,11 +160,11 @@ jobs:
             platform: macos
             arch: arm64
           - target: x86_64-pc-windows-msvc
-            runner: windows-latest-l
+            runner: windows-latest
             platform: windows
             arch: x64
           - target: aarch64-pc-windows-msvc
-            runner: windows-latest-l
+            runner: windows-latest
             platform: windows
             arch: arm64
     env:
@@ -188,6 +177,25 @@ jobs:
         if: ${{ env.RUN_BUILD == 'true' }}
         uses: actions/checkout@v4
 
+      - name: Normalize Cargo version
+        if: ${{ env.RUN_BUILD == 'true' }}
+        shell: bash
+        run: |
+          node <<'NODE'
+          const fs = require('node:fs');
+          const cargoTomlPath = 'apps/desktop/src-tauri/Cargo.toml';
+          const contents = fs.readFileSync(cargoTomlPath, 'utf8');
+          const normalized = contents.replace(
+            /^version\s*=\s*"cap-v([^"]+)"$/m,
+            'version = "$1"',
+          );
+
+          if (normalized !== contents) {
+            fs.writeFileSync(cargoTomlPath, normalized);
+            console.log(`Normalized ${cargoTomlPath} to semver`);
+          }
+          NODE
+
       - name: Create API Key File
         if: ${{ env.RUN_BUILD == 'true' }}
         run: echo "${{ secrets.APPLE_API_KEY_FILE }}" > api.p8
@@ -229,12 +237,61 @@ jobs:
           echo 'VITE_SERVER_URL=${{ secrets.NEXT_PUBLIC_WEB_URL }}' >> .env
           echo 'RUST_TARGET_TRIPLE=${{ matrix.settings.target }}' >> .env
 
+      - name: Prepare Tauri build config
+        if: ${{ env.RUN_BUILD == 'true' }}
+        shell: node {0}
+        env:
+          RAW_TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
+        run: |
+          const fs = require("node:fs");
+          const path = require("node:path");
+
+          const workspace = process.env.GITHUB_WORKSPACE;
+          const sourceConfigPath = path.join(workspace, "apps/desktop/src-tauri/tauri.prod.conf.json");
+          const buildConfigPath = path.join(workspace, "apps/desktop/src-tauri/tauri.build.conf.json");
+          const config = JSON.parse(fs.readFileSync(sourceConfigPath, "utf8"));
+
+          const raw = (process.env.RAW_TAURI_SIGNING_PRIVATE_KEY || "").trim();
+          const candidates = raw
+            ? new Set([raw, raw.replace(/\\n/g, "\n")])
+            : new Set();
+
+          if (raw && /^[A-Za-z0-9+/=\r\n]+$/.test(raw) && !raw.includes("untrusted comment:")) {
+            try {
+              const decoded = Buffer.from(raw.replace(/\s+/g, ""), "base64").toString("utf8");
+              candidates.add(decoded);
+              candidates.add(decoded.replace(/\\n/g, "\n"));
+            } catch {}
+          }
+
+          const key = [...candidates].find(
+            (value) =>
+              value.includes("untrusted comment:") &&
+              value.toLowerCase().includes("minisign secret key"),
+          );
+
+          if (key) {
+            fs.appendFileSync(
+              process.env.GITHUB_ENV,
+              `TAURI_SIGNING_PRIVATE_KEY<<__TAURI_KEY__\n${key}\n__TAURI_KEY__\n`,
+            );
+          } else {
+            config.plugins ??= {};
+            config.plugins.updater ??= {};
+            config.plugins.updater.active = false;
+
+            config.bundle ??= {};
+            config.bundle.createUpdaterArtifacts = false;
+          }
+
+          fs.writeFileSync(buildConfigPath, `${JSON.stringify(config, null, 2)}\n`);
+
       - name: Build app
         if: ${{ env.RUN_BUILD == 'true' }}
         working-directory: apps/desktop
         run: |
           pnpm -w cap-setup
-          pnpm build:tauri --target ${{ matrix.settings.target }} --config src-tauri/tauri.prod.conf.json
+          pnpm build:tauri --target ${{ matrix.settings.target }} --config src-tauri/tauri.build.conf.json
         env:
           # https://github.com/tauri-apps/tauri-action/issues/740
           CI: false
@@ -248,7 +305,6 @@ jobs:
           APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
           APPLE_API_KEY_PATH: ${{ github.workspace }}/api.p8
           APPLE_KEYCHAIN: ${{ runner.temp }}/build.keychain
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
 
       # - name: Upload unsigned Windows installer
@@ -297,15 +353,13 @@ jobs:
       #     Write-Host "Files in bundle directory after signing:"
       #     Get-ChildItem -Path $bundleDir -Filter *.exe | ForEach-Object { Write-Host "  - $($_.Name)" }
 
-      - name: Upload assets
-        if: ${{ env.RUN_BUILD == 'true' }}
-        uses: crabnebula-dev/cloud-release@v0
+      - name: Upload Windows ARM installer artifact
+        if: ${{ env.RUN_BUILD == 'true' && matrix.settings.platform == 'windows' && matrix.settings.arch == 'arm64' }}
+        uses: actions/upload-artifact@v4
         with:
-          working-directory: apps/desktop
-          command: release upload ${{ env.CN_APPLICATION }} "${{ needs.draft.outputs.version }}" --framework tauri
-          api-key: ${{ secrets.CN_API_KEY }}
-        env:
-          TAURI_BUNDLE_PATH: ../..
+          name: windows-arm-installer
+          path: target/${{ matrix.settings.target }}/release/bundle/nsis/*.exe
+          if-no-files-found: error
 
       - uses: matbour/setup-sentry-cli@8ef22a4ff03bcd1ebbcaa3a36a81482ca8e3872e
         if: ${{ env.RUN_BUILD == 'true' }}
@@ -340,7 +394,6 @@ jobs:
           script: |
             async function main() {
               const token = await core.getIDToken("cap-discord-bot");
-              const cnReleaseId = JSON.parse(`${{ needs.draft.outputs.cn_release_stdout }}`).id;
 
               const resp = await fetch(
                 "https://cap-discord-bot.brendonovich.workers.dev/github-workflow",
@@ -351,7 +404,6 @@ jobs:
                     interactionId: "${{ inputs.interactionId }}",
                     version: "${{ needs.draft.outputs.version }}",
                     releaseUrl: "${{ needs.draft.outputs.gh_release_url }}",
-                    cnReleaseId,
                   }),
                   headers: {
                     "Content-Type": "application/json",

apps/desktop/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cap-desktop"
-version = "0.3.83"
+version = "0.4.87"
 description = "Beautiful screen recordings, owned by you."
 authors = ["you"]
 edition = "2024"

apps/desktop/src-tauri/src/recording.rs

@@ -44,7 +44,7 @@ use crate::{
     auth::AuthStore,
     create_screenshot,
     general_settings::{
-        self, GeneralSettingsStore, PostDeletionBehaviour, PostStudioRecordingBehaviour,
+        GeneralSettingsStore, PostDeletionBehaviour, PostStudioRecordingBehaviour,
     },
     open_external_link,
     presets::PresetsStore,
@@ -502,7 +502,9 @@ pub async fn start_recording(
                             general_settings
                                 .map(|s| s.custom_cursor_capture)
                                 .unwrap_or_default(),
-                        );
+                        )
+                        .with_fragmented(false)
+                        .with_max_fps(60);
 
                         #[cfg(target_os = "macos")]
                         {

crates/project/src/meta.rs

@@ -57,6 +57,9 @@ impl Default for Platform {
 
         #[cfg(target_os = "macos")]
         return Self::MacOS;
+
+        #[cfg(not(any(windows, target_os = "macos")))]
+        return Self::Windows;
     }
 }