Merge branch 'main' into onboarding-usage-step

SlimeVR · Dec 12, 2024 · 9c9c552 · 9c9c552
2 parents fa74a74 + bc487f8
commit 9c9c552
Show file tree

Hide file tree

Showing 8 changed files with 224 additions and 21 deletions.
diff --git a/.github/workflows/gradle.yaml b/.github/workflows/gradle.yaml
@@ -144,7 +144,7 @@ jobs:
 
 
   bundle-linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [build, test]
     if: contains(fromJSON('["workflow_dispatch", "create"]'), github.event_name)
     steps:
@@ -160,14 +160,25 @@ jobs:
       - name: Set up Linux dependencies
         uses: awalsh128/cache-apt-pkgs-action@latest
         with:
-          packages: libgtk-3-dev webkit2gtk-4.1 libappindicator3-dev librsvg2-dev patchelf libfuse2
+          packages: |
+            build-essential curl wget file libssl-dev libgtk-3-dev libappindicator3-dev librsvg2-dev
           # Increment to invalidate the cache
-          version: 1.0
+          version: 2.0
           # Enables a workaround to attempt to run pre and post install scripts
           execute_install_scripts: true
           # Disables uploading logs as a build artifact
           debug: false
 
+      - name: Set up specific Linux versioned dependencies
+        run: |
+          sudo apt-get update && sudo apt-get install -y \
+            libwebkit2gtk-4.1-0=2.44.0-2 \
+            libwebkit2gtk-4.1-dev=2.44.0-2 \
+            libjavascriptcoregtk-4.1-0=2.44.0-2 \
+            libjavascriptcoregtk-4.1-dev=2.44.0-2 \
+            gir1.2-javascriptcoregtk-4.1=2.44.0-2 \
+            gir1.2-webkit2-4.1=2.44.0-2;
+
       - name: Cache cargo dependencies
         uses: Swatinem/rust-cache@v2
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gui/src-tauri/Cargo.toml b/gui/src-tauri/Cargo.toml
@@ -28,7 +28,7 @@ shadow-rs = "0.35"
 [dependencies]
 serde_json = "1"
 serde = { version = "1", features = ["derive"] }
-tauri = { version = "2.0", features = ["devtools", "tray-icon", "image-png"] }
+tauri = { version = "2.0", features = ["devtools", "tray-icon", "image-png", "rustls-tls"] }
 tauri-runtime = "2.0"
 tauri-plugin-dialog = "2.0"
 tauri-plugin-fs = "2.0"

diff --git a/gui/src-tauri/src/main.rs b/gui/src-tauri/src/main.rs
@@ -90,8 +90,12 @@ fn main() -> Result<()> {
 			.log_to_file(
 				FileSpec::default().directory(path.expect("We need a log dir")),
 			)
-			.format_for_files(util::logger_format)
-			.format_for_stderr(util::logger_format)
+			.format_for_files(|w, now, record| {
+				util::logger_format(w, now, record, false)
+			})
+			.format_for_stderr(|w, now, record| {
+				util::logger_format(w, now, record, true)
+			})
 			.rotate(
 				Criterion::Age(Age::Day),
 				Naming::Timestamps,

diff --git a/gui/src-tauri/src/tray.rs b/gui/src-tauri/src/tray.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashMap, sync::Mutex};
 
 use tauri::{
-	image::Image,
+	include_image,
 	menu::{Menu, MenuBuilder, MenuItemBuilder, MenuItemKind},
 	tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent},
 	AppHandle, Emitter, Manager, Runtime, State,
@@ -107,10 +107,10 @@ pub fn create_tray<R: Runtime>(app: &tauri::AppHandle<R>) -> tauri::Result<()> {
 		.icon_as_template(true)
 		.menu_on_left_click(false)
 		.icon(if cfg!(target_os = "macos") {
-			Image::from_bytes(include_bytes!("../icons/appleTrayIcon.png"))
+			include_image!("icons/appleTrayIcon.png")
 		} else {
-			Image::from_bytes(include_bytes!("../icons/128x128.png"))
-		}?)
+			include_image!("icons/128x128.png")
+		})
 		.on_menu_event(move |app, event| match event.id.as_ref() {
 			"quit" => app.emit("try-close", "tray").unwrap(),
 			"toggle" => {