diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index d792fa1..45fc0e1 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -46,31 +46,49 @@ jobs: workspaces: | ./src-tauri -> target ./rust/core -> target - + - name: Install MSVC dev tools (windows only) uses: TheMrMilchmann/setup-msvc-dev@v3 if: startsWith(matrix.platform, 'windows') with: arch: x64 - - name: Install CUDA (windows only) + - name: Free Disk Space (Ubuntu) + uses: jlumbroso/free-disk-space@main + if: startsWith(matrix.platform, 'ubuntu') + with: + # this might remove tools that are actually needed, + # if set to "true" but frees about 6 GB + tool-cache: false + + # all of these default to true, but feel free to set to + # "false" if necessary for your workflow + android: true + dotnet: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true + + - name: install dependencies (ubuntu only) + if: startsWith(matrix.platform, 'ubuntu') + run: | + sudo apt-get update + sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf librust-alsa-sys-dev xdg-utils + + - name: Install CUDA uses: Jimver/cuda-toolkit@master - if: startsWith(matrix.platform, 'windows') id: cuda-toolkit + if: "!startsWith(matrix.platform, 'macos')" with: - cuda: '10.2.89' + cuda: '13.0.2' + linux-local-args: '["--toolkit"]' log-file-suffix: '${{matrix.os}}.txt' - name: Install rust target (macos only) if: startsWith(matrix.platform, 'macos') run: rustup target add x86_64-apple-darwin - - name: install dependencies (ubuntu only) - if: startsWith(matrix.platform, 'ubuntu') - run: | - sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf librust-alsa-sys-dev - - name: Set short SHA id: short-sha run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT" @@ -84,7 +102,7 @@ jobs: - name: Var check run: echo "SHORT_SHA=${{ steps.short-sha.outputs.SHORT_SHA }}, VERSION=${{ steps.tauri-version.outputs.VERSION }}" shell: bash - + - name: Read SUMRY file id: sumry run: | diff --git a/.github/workflows/test-on-push.yml b/.github/workflows/test-on-push.yml index 0025139..bd384a3 100644 --- a/.github/workflows/test-on-push.yml +++ b/.github/workflows/test-on-push.yml @@ -50,24 +50,43 @@ jobs: if: startsWith(matrix.platform, 'windows') with: arch: x64 + + - name: Free Disk Space (Ubuntu) + uses: jlumbroso/free-disk-space@main + if: startsWith(matrix.platform, 'ubuntu') + with: + # this might remove tools that are actually needed, + # if set to "true" but frees about 6 GB + tool-cache: false + + # all of these default to true, but feel free to set to + # "false" if necessary for your workflow + android: true + dotnet: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true + + - name: install dependencies (ubuntu only) + if: startsWith(matrix.platform, 'ubuntu') + run: | + sudo apt-get update + sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf librust-alsa-sys-dev xdg-utils - - name: Install CUDA (windows only) + - name: Install CUDA uses: Jimver/cuda-toolkit@master - if: startsWith(matrix.platform, 'windows') id: cuda-toolkit + if: "!startsWith(matrix.platform, 'macos')" with: + cuda: '13.0.2' + linux-local-args: '["--toolkit"]' log-file-suffix: '${{matrix.os}}.txt' - name: Install rust target (macos only) if: startsWith(matrix.platform, 'macos') run: rustup target add x86_64-apple-darwin - - name: install dependencies (ubuntu only) - if: startsWith(matrix.platform, 'ubuntu') - run: | - sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf librust-alsa-sys-dev - - name: Set short SHA id: short-sha run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT" @@ -88,3 +107,5 @@ jobs: TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} CMAKE_OSX_DEPLOYMENT_TARGET: 13.3 + with: + args: ${{ matrix.args }} diff --git a/Cargo.lock b/Cargo.lock index 01dfae7..aaebd4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4389,7 +4389,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrybe" -version = "0.2.3" +version = "0.2.4" dependencies = [ "anyhow", "color-eyre", diff --git a/package.json b/package.json index 0eb6a00..6c22f35 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scrybe", - "version": "0.2.3", + "version": "0.2.4", "private": false, "scripts": { "build": "vite build", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index ee72ae1..8a2e56d 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -54,16 +54,16 @@ authors = ["you"] description = "A Tauri App" edition = "2021" name = "scrybe" -version = "0.2.3" +version = "0.2.4" [target] +[target."cfg(not(target_os = \"macos\"))"] +[target."cfg(not(target_os = \"macos\"))".dependencies] +[target."cfg(not(target_os = \"macos\"))".dependencies.scrybe_core] +features = ["cuda"] +path = "../rust/core" [target."cfg(target_os = \"macos\")"] [target."cfg(target_os = \"macos\")".dependencies] [target."cfg(target_os = \"macos\")".dependencies.scrybe_core] features = ["coreml", "metal"] path = "../rust/core" -[target."cfg(windows)"] -[target."cfg(windows)".dependencies] -[target."cfg(windows)".dependencies.scrybe_core] -features = ["cuda"] -path = "../rust/core" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c33989f..3503ed0 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -22,7 +22,13 @@ "icons/icon.icns", "icons/icon.ico" ], - "targets": "all" + "targets": [ + "deb", + "rpm", + "nsis", + "app", + "dmg" + ] }, "identifier": "com.scrybe.live", "plugins": { @@ -34,5 +40,5 @@ } }, "productName": "Scrybe", - "version": "0.2.3" + "version": "0.2.4" } \ No newline at end of file