Skip to content

Commit

Permalink
Merge pull request #72 from SARDONYX-sard/feature/fix-white-screen
Browse files Browse the repository at this point in the history
fix: fix white screen & to tauri v2
  • Loading branch information
SARDONYX-sard authored Sep 18, 2024
2 parents e4d11c1 + 73e71eb commit 98d2730
Show file tree
Hide file tree
Showing 27 changed files with 1,765 additions and 763 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/lint-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev
- name: Check format
run: cargo fmt --all -- --check
Expand All @@ -52,7 +52,7 @@ jobs:
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev
- name: Test(Rust)
run: cargo test --workspace
Expand All @@ -76,7 +76,7 @@ jobs:
# You can remove libayatana-appindicator3-dev if you don't use the system tray feature.
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev
- name: Build Test(CLI)
run: cargo build --release
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
shell: bash
if: runner.os == 'Linux'
run: |
mv ./target/release/g-dar2oar ./build
mv ./target/release/g_dar2oar ./build
mv ./target/release/dar2oar ./build
- name: Upload a Build Artifact
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ build
test/data/*
!test/data/*.md
*.log
gui/backend/gen/

# Rust build cache
**/target
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"[css]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[javascript][javascriptreact][typescript][typescriptreact]": {
"editor.defaultFormatter": "biomejs.biome"
},
Expand Down
Loading

0 comments on commit 98d2730

Please sign in to comment.