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-927, ENG-735, ENG-766] Fix Updater & Tauri 1.5 #1361

Merged
merged 41 commits into from
Oct 10, 2023
Merged

[ENG-927, ENG-735, ENG-766] Fix Updater & Tauri 1.5 #1361

merged 41 commits into from
Oct 10, 2023

Conversation

Brendonovich
Copy link
Contributor

@Brendonovich Brendonovich commented Sep 20, 2023 •
edited
Loading

  • Uses this Tauri PR Tauri 1.5
  • Disables Tauri's updater dialog in favour of our own toasts and buttons
  • Most version numbers removed in favour of desktop/src-tauri/Cargo.toml

To test updating, change the updater origin from spacedrive.com to spacedrive-landing-git-eng-927-fix-updater-spacedrive.vercel.app, and if you want to test in dev mode then remove the && import.meta.env.PROD in desktop/src/updater.ts.

Tested on:

  • macOS aarch64
  • macOS x86_64
  • linux x86_64
  • windows x86_64

@linear
Copy link

linear bot commented Sep 20, 2023

ENG-927 Fix updater

tauri-apps/tauri#7480

@vercel
Copy link

vercel bot commented Sep 20, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
spacedrive-landing ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 10, 2023 4:19am
spacedrive-web ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 10, 2023 4:19am

@Brendonovich Brendonovich marked this pull request as ready for review September 20, 2023 09:06
@Brendonovich Brendonovich requested review from a team as code owners September 20, 2023 09:06
utkubakir
utkubakir previously approved these changes Sep 21, 2023
View reviewed changes
Copy link
Contributor

@utkubakir utkubakir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not tested but it lgtm

@utkubakir utkubakir added this pull request to the merge queue Sep 22, 2023
@Brendonovich Brendonovich removed this pull request from the merge queue due to a manual request Sep 22, 2023
@Brendonovich Brendonovich marked this pull request as draft September 22, 2023 10:16
@HeavenVolkoff HeavenVolkoff changed the title [ENG-297, ENG-735, ENG-766] Fix Updater & Tauri 1.5 [ENG-927, ENG-735, ENG-766] Fix Updater & Tauri 1.5 Oct 5, 2023
HeavenVolkoff
HeavenVolkoff previously approved these changes Oct 5, 2023
View reviewed changes
@HeavenVolkoff HeavenVolkoff mentioned this pull request Oct 5, 2023
Closed
brxken128
brxken128 approved these changes Oct 10, 2023
View reviewed changes
Copy link
Contributor

@brxken128 brxken128 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've personally tested this on Windows 11, Void Linux, Fedora 38, and MacOS 13.5 - works great.

@Brendonovich Brendonovich added this pull request to the merge queue Oct 10, 2023
Merged via the queue into main with commit 49cc098 Oct 10, 2023
@utkubakir utkubakir deleted the eng-927-fix-updater branch October 11, 2023 06:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brxken128 brxken128 brxken128 approved these changes

@HeavenVolkoff HeavenVolkoff HeavenVolkoff left review comments

@utkubakir utkubakir Awaiting requested review from utkubakir

@oscartbeaumont oscartbeaumont Awaiting requested review from oscartbeaumont

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Brendonovich @HeavenVolkoff @oscartbeaumont @utkubakir @brxken128 @fogodev