Merge pull request #11 from edgenai/feat/macos-compilation

feat/macos-compilation
edgenai · Feb 1, 2024 · d602d2f · d602d2f
2 parents 2d883c9 + 4777197
commit d602d2f
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 54 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,8 +1,10 @@
 name: "release"
 on:
   push:
-    branches:
-      - main
+    branches: [ "*" ]
+  pull_request:
+    branches: [ "*" ]
+
 
 # This is the example from the readme.
 # On each push to the `main` branch it will create or update a GitHub release, build your app, and upload the artifacts to the release.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -56,10 +56,6 @@ toml_edit = "0.21.0"
 tracing = "0.1.40"
 uuid = "1.6.1"
 utoipa = { version = "4", features = ["yaml"] }
-llama_cpp = { git = "https://github.com/edgenai/llama_cpp-rs", branch = "build-overhaul" }
-whisper_cpp = { git = "https://github.com/edgenai/whisper_cpp-rs", branch = "build-overhaul" }
+llama_cpp = { git = "https://github.com/edgenai/llama_cpp-rs", branch = "main" }
+whisper_cpp = { git = "https://github.com/edgenai/whisper_cpp-rs", branch = "main" }
 tauri = { version = "1.5.4", features = [] }
-
-[patch.crates-io]
-llama_cpp = { git = "https://github.com/edgenai/llama_cpp-rs", branch = "build-overhaul" }
-llama_cpp_sys = { git = "https://github.com/edgenai/llama_cpp-rs", branch = "build-overhaul" }