Merge branch 'main' into main

crabnebula-dev · Sep 5, 2024 · df4be9b · df4be9b
2 parents e43186d + dbbdfa3
commit df4be9b
Show file tree

Hide file tree

Showing 21 changed files with 1,571 additions and 674 deletions.
diff --git a/.changes/fix-appimage-bundle.md b/.changes/fix-appimage-bundle.md
@@ -0,0 +1,5 @@
+---
+"cargo-packager": patch
+---
+
+Fixes AppImage bundling failing due to missing `/usr/lib64` directory.
diff --git a/.github/workflows/build-examples.yml b/.github/workflows/build-examples.yml
@@ -29,15 +29,15 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 webkit2gtk-4.0 libayatana-appindicator3-dev
+          sudo apt-get install -y webkit2gtk-4.1 webkit2gtk-4.0 libayatana-appindicator3-dev libxdo-dev
       - uses: dtolnay/rust-toolchain@stable
       - uses: actions/setup-go@v5
         with:
           go-version: "stable"
       - uses: denoland/setup-deno@v1
       - uses: Swatinem/rust-cache@v2
       - run: go install github.com/wailsapp/wails/v2/cmd/wails@latest
-      - run: cargo install tauri-cli --version "2.0.0-alpha.10" --locked
+      - run: cargo install tauri-cli --version "2.0.0-rc.10" --locked
       - run: cargo install dioxus-cli --locked
       - run: cargo r --package cargo-packager -- signer generate --password '123' --path ./signing-key -vvv
       - run: cargo r --package cargo-packager -- --release --private-key ./signing-key --password '123' --formats all -vvv
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -63,7 +63,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y  webkit2gtk-4.1 libayatana-appindicator3-dev
+          sudo apt-get install -y  webkit2gtk-4.1 libayatana-appindicator3-dev libxdo-dev
       - uses: Swatinem/rust-cache@v2
       - run: cargo clippy --workspace --all-targets --all-features -- -D warnings
 
@@ -81,7 +81,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev
+          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev libxdo-dev
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - run: cargo test --workspace --lib --bins --tests --benches --all-features --no-fail-fast