Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ENG-1690] Upgrade to Tauri 2.0 #2433

Merged
merged 19 commits into from
May 7, 2024
Merged

[ENG-1690] Upgrade to Tauri 2.0 #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
689c6bd
Most of it
oscartbeaumont May 1, 2024
8cfa123
Cleanup menu
oscartbeaumont May 2, 2024
6db2cc2
fixes
oscartbeaumont May 2, 2024
f68fc7d
Merge remote-tracking branch 'origin/main' into tauriiiii-v2
HeavenVolkoff May 3, 2024
74a3d0d
Fixed linux compilation, still not working though, as the app panic o…
HeavenVolkoff May 3, 2024
afa430f
Add dialog permissions
oscartbeaumont May 3, 2024
7303183
fix search keybind
oscartbeaumont May 3, 2024
8dc31ed
Fix linux
HeavenVolkoff May 4, 2024
2a0d0b8
Update to Ubuntu 22.04, new tauri doesn't support ubuntu 20.04
HeavenVolkoff May 4, 2024
ac9078f
Remove gen/schemas
HeavenVolkoff May 4, 2024
3a046d3
Update linux dependencies in setup.sh
HeavenVolkoff May 4, 2024
a4d132e
Fix linux deps again
HeavenVolkoff May 4, 2024
0358aca
Clippy + auto fmt
HeavenVolkoff May 4, 2024
bbbade1
Fix cache-factory
HeavenVolkoff May 4, 2024
a51576b
Fix minor error in patchTauri.mjs
HeavenVolkoff May 4, 2024
4d7c2dd
Merge remote-tracking branch 'origin/main' into tauriiiii-v2
HeavenVolkoff May 4, 2024
6effc26
Fix some envvars that have been renamed on tauri v2
HeavenVolkoff May 5, 2024
52ef6af
Dont change the secrets
HeavenVolkoff May 5, 2024
649aed6
Add missing linux dependency
HeavenVolkoff May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/cache-factory.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ jobs:
target: x86_64-pc-windows-msvc
# - host: windows-latest
# target: aarch64-pc-windows-msvc
- host: ubuntu-20.04
- host: ubuntu-22.04
target: x86_64-unknown-linux-gnu
# - host: ubuntu-20.04
# - host: ubuntu-22.04
# target: x86_64-unknown-linux-musl
# - host: ubuntu-20.04
# - host: uubuntu-22.04
# target: aarch64-unknown-linux-gnu
# - host: ubuntu-20.04
# - host: ubuntu-22.04
# target: aarch64-unknown-linux-musl
# - host: ubuntu-20.04
# - host: ubuntu-22.04
# target: armv7-unknown-linux-gnueabihf
name: 'Make Cache'
runs-on: ${{ matrix.settings.host }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ jobs:
runs-on: ${{ matrix.platform }}
strategy:
matrix:
platform: [ubuntu-20.04, macos-14, windows-latest]
platform: [ubuntu-22.04, macos-14, windows-latest]
permissions:
contents: read
timeout-minutes: 45
Expand Down Expand Up @@ -241,7 +241,7 @@ jobs:
# runs-on: ${{ matrix.platform }}
# strategy:
# matrix:
# platform: [ubuntu-20.04, macos-latest, windows-latest]
# platform: [ubuntu-22.04, macos-latest, windows-latest]
# steps:
# - name: Checkout repository
# uses: actions/checkout@v4
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ jobs:
arch: x86_64
# - host: windows-latest
# target: aarch64-pc-windows-msvc
- host: ubuntu-20.04
- host: ubuntu-22.04
target: x86_64-unknown-linux-gnu
bundles: deb
os: linux
arch: x86_64
# - host: ubuntu-20.04
# - host: ubuntu-22.04
# target: x86_64-unknown-linux-musl
# - host: ubuntu-20.04
# - host: ubuntu-22.04
# target: aarch64-unknown-linux-gnu
# bundles: deb
# - host: ubuntu-20.04
# - host: ubuntu-22.04
# target: aarch64-unknown-linux-musl
name: Desktop - Main ${{ matrix.settings.target }}
runs-on: ${{ matrix.settings.host }}
Expand Down Expand Up @@ -101,8 +101,8 @@ jobs:
run: |
pnpm tauri build --ci -v --target ${{ matrix.settings.target }} --bundles ${{ matrix.settings.bundles }},updater
env:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
Expand Down