Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 29 additions & 11 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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: |
Expand Down
37 changes: 29 additions & 8 deletions .github/workflows/test-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scrybe",
"version": "0.2.3",
"version": "0.2.4",
"private": false,
"scripts": {
"build": "vite build",
Expand Down
12 changes: 6 additions & 6 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 8 additions & 2 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@
"icons/icon.icns",
"icons/icon.ico"
],
"targets": "all"
"targets": [
"deb",
"rpm",
"nsis",
"app",
"dmg"
]
},
"identifier": "com.scrybe.live",
"plugins": {
Expand All @@ -34,5 +40,5 @@
}
},
"productName": "Scrybe",
"version": "0.2.3"
"version": "0.2.4"
}