From dc0cc3bfaa0250095bcebb1e2a7764966b917fc7 Mon Sep 17 00:00:00 2001 From: netrunner Date: Thu, 14 Nov 2024 20:31:57 +0100 Subject: [PATCH 1/4] add submodule --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..952298a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "studio/rust-llama.cpp"] + path = studio/rust-llama.cpp + url = https://github.com/mdrokz/rust-llama.cpp From 1bd94cf6fe6dc55ce45613ba852d47096393108c Mon Sep 17 00:00:00 2001 From: netrunner Date: Thu, 14 Nov 2024 20:36:03 +0100 Subject: [PATCH 2/4] update workflow --- .github/workflows/tauri_release.yaml | 3 +++ makefile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/tauri_release.yaml b/.github/workflows/tauri_release.yaml index 7fcc0b8..76ae655 100644 --- a/.github/workflows/tauri_release.yaml +++ b/.github/workflows/tauri_release.yaml @@ -45,6 +45,9 @@ jobs: # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2. # You can remove the one that doesn't apply to your app to speed up the workflow a bit. + - name: download llama.cpp + run: make setup + - uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/makefile b/makefile index 1d0c748..7015a16 100644 --- a/makefile +++ b/makefile @@ -90,3 +90,6 @@ run-app: # make clear-home-runtime cd ./app && cargo tauri dev cd ./app/target/release && ./shog-studio + +setup: + cd ./studio/ && git clone https://github.com/mdrokz/rust-llama.cpp --recursive From 2b7aa0360877271512cce149925276ee8c1a65e3 Mon Sep 17 00:00:00 2001 From: netrunner Date: Thu, 14 Nov 2024 21:14:47 +0100 Subject: [PATCH 3/4] version bump --- studio/src/lib.rs | 2 +- version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/studio/src/lib.rs b/studio/src/lib.rs index 1c14877..4dd8024 100644 --- a/studio/src/lib.rs +++ b/studio/src/lib.rs @@ -60,7 +60,7 @@ pub struct Args { pub subcommand_arg: Option, } -const VERSION: &str = "1.0.2"; +const VERSION: &str = "1.6.7"; const HUB_URL: &str = "https://hub.shog.ai"; const NODE_REFRESH_RATE: u64 = 100; diff --git a/version.txt b/version.txt index 6d7de6e..400084b 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.2 +1.6.7 From 68f89d09e462a4d39734ed787b333db7235da149 Mon Sep 17 00:00:00 2001 From: netrunner Date: Thu, 14 Nov 2024 21:31:49 +0100 Subject: [PATCH 4/4] version bump --- app/tauri.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tauri.conf.json b/app/tauri.conf.json index 9b50dcb..a49dd37 100644 --- a/app/tauri.conf.json +++ b/app/tauri.conf.json @@ -7,7 +7,7 @@ }, "package": { "productName": "Shog Studio", - "version": "1.0.2" + "version": "1.6.7" }, "tauri": { "allowlist": {