diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 45fc0e1..0c764a6 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -12,12 +12,12 @@ jobs: fail-fast: true matrix: include: + - platform: 'windows-latest' + args: '' - platform: 'macos-14' args: '--target universal-apple-darwin' - platform: 'ubuntu-latest' args: '' - - platform: 'windows-latest' - args: '' runs-on: ${{ matrix.platform }} steps: @@ -102,6 +102,11 @@ jobs: - name: Var check run: echo "SHORT_SHA=${{ steps.short-sha.outputs.SHORT_SHA }}, VERSION=${{ steps.tauri-version.outputs.VERSION }}" shell: bash + + - name: Copy CUDA DLLs (windows only) + if: startsWith(matrix.platform, 'windows') + run: cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}\bin\x64\cublas64_13.dll" ".\src-tauri\" + shell: pwsh - name: Read SUMRY file id: sumry diff --git a/.github/workflows/test-on-push.yml b/.github/workflows/test-on-push.yml index bd384a3..800e1c1 100644 --- a/.github/workflows/test-on-push.yml +++ b/.github/workflows/test-on-push.yml @@ -10,12 +10,12 @@ jobs: fail-fast: false matrix: include: + - platform: 'windows-latest' + args: '' - platform: 'macos-14' args: '--target universal-apple-darwin' - platform: 'ubuntu-latest' args: '' - - platform: 'windows-latest' - args: '' runs-on: ${{ matrix.platform }} steps: @@ -101,6 +101,11 @@ jobs: run: echo "SHORT_SHA=${{ steps.short-sha.outputs.SHORT_SHA }}, VERSION=${{ steps.tauri-version.outputs.VERSION }}" shell: bash + - name: Copy CUDA DLLs (windows only) + if: startsWith(matrix.platform, 'windows') + run: cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}\bin\x64\cublas64_13.dll" ".\src-tauri\" + shell: pwsh + - uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Cargo.lock b/Cargo.lock index aaebd4f..3daa7e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4389,7 +4389,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrybe" -version = "0.2.4" +version = "0.2.5" dependencies = [ "anyhow", "color-eyre", @@ -4436,6 +4436,7 @@ dependencies = [ "samplerate", "serde", "specta", + "tauri-specta", "whisper-rs", ] diff --git a/package.json b/package.json index 6c22f35..f7ed8b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scrybe", - "version": "0.2.4", + "version": "0.2.5", "private": false, "scripts": { "build": "vite build", diff --git a/rust/core/Cargo.toml b/rust/core/Cargo.toml index 2eda1c6..5431ed2 100644 --- a/rust/core/Cargo.toml +++ b/rust/core/Cargo.toml @@ -17,6 +17,9 @@ clap = { version = "4.5.23", features = ["derive", "string"] } whisper-rs = { version = "=0.15.1"} serde = {version = "1.0.216", features = ["derive"]} specta = "=2.0.0-rc.22" +[dependencies.tauri-specta] +features = ["derive", "typescript"] +version = "=2.0.0-rc.21" [features] default = [] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 8a2e56d..1d3f627 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -54,7 +54,7 @@ authors = ["you"] description = "A Tauri App" edition = "2021" name = "scrybe" -version = "0.2.4" +version = "0.2.5" [target] [target."cfg(not(target_os = \"macos\"))"] diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 3503ed0..5864470 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,44 +1,44 @@ { - "$schema": "https://schema.tauri.app/config/2", - "app": { - "security": { - "csp": null + "$schema": "https://schema.tauri.app/config/2", + "app": { + "security": { + "csp": null + }, + "windows": [] }, - "windows": [] - }, - "build": { - "beforeBuildCommand": "pnpm build", - "beforeDevCommand": "pnpm dev", - "devUrl": "http://localhost:1420", - "frontendDist": "../build" - }, - "bundle": { - "active": true, - "createUpdaterArtifacts": true, - "icon": [ - "icons/32x32.png", - "icons/128x128.png", - "icons/128x128@2x.png", - "icons/icon.icns", - "icons/icon.ico" - ], - "targets": [ - "deb", - "rpm", - "nsis", - "app", - "dmg" - ] - }, - "identifier": "com.scrybe.live", - "plugins": { - "updater": { - "endpoints": [ - "https://github.com/synthlabs/scrybe/releases/latest/download/latest.json" - ], - "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDIxM0EyNDBGNTM2M0Y2QTYKUldTbTltTlREeVE2SVRhZGhDamlXeHNHc2lzTjNLWFZWNXlJVVZFUytURmtHb2pXYm5CT0syRDcK" - } - }, - "productName": "Scrybe", - "version": "0.2.4" + "build": { + "beforeBuildCommand": "pnpm build", + "beforeDevCommand": "pnpm dev", + "devUrl": "http://localhost:1420", + "frontendDist": "../build" + }, + "bundle": { + "active": true, + "createUpdaterArtifacts": true, + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ], + "targets": [ + "deb", + "rpm", + "nsis", + "app", + "dmg" + ] + }, + "identifier": "com.scrybe.live", + "plugins": { + "updater": { + "endpoints": [ + "https://github.com/synthlabs/scrybe/releases/latest/download/latest.json" + ], + "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDIxM0EyNDBGNTM2M0Y2QTYKUldTbTltTlREeVE2SVRhZGhDamlXeHNHc2lzTjNLWFZWNXlJVVZFUytURmtHb2pXYm5CT0syRDcK" + } + }, + "productName": "Scrybe", + "version": "0.2.5" } \ No newline at end of file diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json new file mode 100644 index 0000000..5f3550a --- /dev/null +++ b/src-tauri/tauri.windows.conf.json @@ -0,0 +1,8 @@ +{ + "identifier": "com.scrybe.live", + "bundle": { + "resources": [ + "cublas64_13.dll" + ] + } +} \ No newline at end of file diff --git a/src/routes/(app)/settings/+page.svelte b/src/routes/(app)/settings/+page.svelte index 294b15a..36b874e 100644 --- a/src/routes/(app)/settings/+page.svelte +++ b/src/routes/(app)/settings/+page.svelte @@ -119,7 +119,6 @@
-