From c3c31dea47eb4134711ae454c2c0db6a43385ffc Mon Sep 17 00:00:00 2001 From: qdust41 Date: Fri, 17 Apr 2026 04:43:11 -0400 Subject: [PATCH] trying to prepare for an appimage as well as prevent issues with compositing_mode stuff --- .github/workflows/release.yaml | 5 +++-- run-tauri-dev.sh | 2 -- src-tauri/src/main.rs | 3 +++ src-tauri/tauri.conf.json | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) delete mode 100755 run-tauri-dev.sh diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 252db8f..4d5d6b5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-22.04, windows-latest] + platform: [ubuntu-22.04, windows-latest, ] runs-on: ${{ matrix.platform }} steps: @@ -33,13 +33,14 @@ jobs: if: matrix.platform == 'ubuntu-22.04' run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf + sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libfuse2 - name: install pnpm packages run: pnpm install - name: build Oxyde uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NO_STRIP: true SURREAL_URL: ${{ secrets.SURREAL_URL }} SURREAL_NS: ${{ secrets.SURREAL_NS }} SURREAL_DB: ${{ secrets.SURREAL_DB }} diff --git a/run-tauri-dev.sh b/run-tauri-dev.sh deleted file mode 100755 index 071956b..0000000 --- a/run-tauri-dev.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/bash -WEBKIT_DISABLE_DMABUF_RENDERER=1 pnpm tauri dev \ No newline at end of file diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 70e6c6e..cd42b01 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -2,5 +2,8 @@ #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] fn main() { + #[cfg(target_os = "linux")] + std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1"); + oxyde_lib::run() } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 051a890..fdb58e5 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -24,7 +24,7 @@ }, "bundle": { "active": true, - "targets": ["deb", "nsis"], + "targets": ["deb", "nsis", "appimage"], "icon": [ "icons/32x32.png", "icons/128x128.png",