-
-
Notifications
You must be signed in to change notification settings - Fork 5k
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.
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
Desktop: Resolves #8258: Upgrade to Electron 25 #8451
Desktop: Resolves #8258: Upgrade to Electron 25 #8451
Conversation
…' into pr/upgrade-electron
- nsExec::Exec `cmd /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" | %SYSTEMROOT%\System32\find.exe "${_FILE}"` | ||
+ nsExec::Exec `cmd /c tasklist /FI "USERNAME eq %USERNAME%" /FI "PID ne $pid" /FI "IMAGENAME eq ${_FILE}" | %SYSTEMROOT%\System32\find.exe "${_FILE}"` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See the explanation for this change here: electron-userland/electron-builder#6865 (comment)
This seems to fix #8149. To test it, I
- Installed a copy of Joplin with the updated installer and opened Joplin.
- Opened a new copy of the installer while Joplin was running and had the installer close the exiting Joplin application (then proceeded with the re-installation).
- Re-installed Joplin using the installer with no running copies of Joplin.
All of the above tests used the "only for me" option in the dialog (the above logic should only affect the "only for me" option).
I then installed with the "anyone who uses this computer" option, then uninstalled.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've tested with the following user accounts:
and it still seems to work...
However, the unpatched version of the installer also seems to work (though the unpatched installer does seem to close itself and not install if the app is already running in some cases, while the patched installer does not).
Thanks, that looks very good at first sight and all checks have passed. For printing, it's always a struggle to get it working and indeed I don't think those are new bugs.
But not on this pull request? Hard to tell without seeing the diff but probably it shouldn't happen |
Yes it looks like it's something else, maybe something related to the autocrlf or safecrlf gitconfig, so we can ignore this for now. Are there other tests you need to run on the Electron upgrade or is it ready to merge? |
I'm unresolving the above windows installer patch issue. I'm no longer convinced that the patch works. As per comment, the issue might be related to the length of the path to the running process. I'll test again with a long username and report back. If that works, this should be ready to merge. |
Even though the installer seems to work on Windows (even with spaces, non-ASCII in usernames see tests above), it's possible that it's still affected by electron-userland/electron-builder#6865. It looks like the installer issue can occur on Windows 11 (and, based on comments on that issue, when the installer is located on the C:\ drive). Thus, I'm guessing that the issue has been fixed, but am not certain. If users do experience the issue, we can either
|
Thanks @personalizedrefrigerator, I think we can merge then, and if we get any feedback about this during prerelease we can apply one of your suggestions. |
Summary
Upgrades Electron to v25.2.0.
This resolves #8258.
Notes
electron-builder
v23+.nan
which was incompatible with the new version of Electron. Manually removing the entry for this version ofnan
fromyarn.lock
and re-runningyarn install
seems to have fixed the issue.alias python=$(which python3)
instead of thePYTHON_PATH=
workaround seems to now be necessary on MacOS...electron-rebuild
has been renamed to@electron/rebuild
.Testing Summary
Tests were done with commit e08d918
Windows:
Some Windows tests were only done with commit 5c47401, but many were done with both 5c47401 and e08d918.
Check resource attachment
Check external editing
Check export/import
Check sync
Check print
Check plugins
Portable version launches and can view notes
Note: I'm getting a huge diff on Windows after running the build script. Is this expected?
(.gitignore and .eslintignore had also changed and all .js files were no longer ignored).
MacOS
Check resource attachment
Check external editing
Check export/import
Check sync
Check print
Check plugins
Linux/Fedora
Check resource attachment
Check external editing
Check export/import
Check sync
Check print
Check plugins