diff --git a/.github/workflows/release-tamagotchi.yml b/.github/workflows/release-tamagotchi.yml index d424496af..878c78da4 100644 --- a/.github/workflows/release-tamagotchi.yml +++ b/.github/workflows/release-tamagotchi.yml @@ -15,22 +15,27 @@ jobs: matrix: include: - os: macos-latest + platform: macos target: x86_64-apple-darwin arch: x64 artifact: dmg - os: macos-latest + platform: macos target: aarch64-apple-darwin arch: aarch64 artifact: dmg - os: ubuntu-latest + platform: linux target: x86_64-unknown-linux-gnu arch: x86_64 artifact: AppImage - os: ubuntu-24.04-arm + platform: linux target: aarch64-unknown-linux-gnu arch: aarch64 artifact: AppImage - os: windows-latest + platform: windows target: x86_64-pc-windows-msvc arch: x64 artifact: exe @@ -61,7 +66,7 @@ jobs: if: matrix.platform == 'linux' # This must match the platform value defined above. run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libglib2.0-dev + sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf - name: Get pnpm store directory shell: bash diff --git a/.vscode/settings.json b/.vscode/settings.json index 218bd1e13..30508562d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -55,6 +55,7 @@ "typescript.tsdk": "node_modules/typescript/lib", "cSpell.words": [ + "appimage", "localforage" ] } diff --git a/apps/stage-tamagotchi-tauri/src-tauri/src/lib.rs b/apps/stage-tamagotchi-tauri/src-tauri/src/lib.rs index 929c5b4c9..cb0174689 100644 --- a/apps/stage-tamagotchi-tauri/src-tauri/src/lib.rs +++ b/apps/stage-tamagotchi-tauri/src-tauri/src/lib.rs @@ -1,4 +1,6 @@ -use tauri::{TitleBarStyle, WebviewUrl, WebviewWindowBuilder, ActivationPolicy, Manager}; +use tauri::{WebviewUrl, WebviewWindowBuilder, Manager}; +#[cfg(target_os = "macos")] +use tauri::{ActivationPolicy,TitleBarStyle}; use tauri::tray::{TrayIconBuilder}; use tauri::menu::{Menu, MenuItem}; use std::path::Path; @@ -10,14 +12,20 @@ pub fn run() { tauri::Builder::default() .plugin(tauri_plugin_os::init()) .setup(|app| { - let _ = WebviewWindowBuilder::new(app, "main", WebviewUrl::default()) + let mut builder = WebviewWindowBuilder::new(app, "main", WebviewUrl::default()) .title("airi") - .title_bar_style(TitleBarStyle::Transparent) .decorations(false) .inner_size(450.0, 600.0) .shadow(false) .transparent(true) - .always_on_top(true) + .always_on_top(true); + + #[cfg(target_os = "macos")] + { + builder = builder.title_bar_style(TitleBarStyle::Transparent); + } + + let _ = builder .build() .unwrap(); diff --git a/apps/stage-tamagotchi-tauri/src-tauri/tauri.conf.json b/apps/stage-tamagotchi-tauri/src-tauri/tauri.conf.json index 27aa7640f..18baa6799 100644 --- a/apps/stage-tamagotchi-tauri/src-tauri/tauri.conf.json +++ b/apps/stage-tamagotchi-tauri/src-tauri/tauri.conf.json @@ -17,7 +17,7 @@ }, "bundle": { "active": true, - "targets": "all", + "targets": ["dmg", "appimage", "nsis"], "icon": [ "icons/32x32.png", "icons/128x128.png",