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.

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

fix(nsis): cleanup temporary 7z folder #6793

Merged
merged 1 commit into from
Apr 15, 2022

Conversation

indutny-signal
Copy link
Contributor

@indutny-signal indutny-signal commented Apr 14, 2022

Before attempting to extract files with non-discriminating
Nsis7z::Extract that ignores the errors remove the temporary folder so
that we don't require twice as much disk space for this last resort
measure.

Additionally, replace Quit with a Goto DoneExtract7za so that the
last resort measure actually works.

Testing

image

@changeset-bot
Copy link

changeset-bot bot commented Apr 14, 2022

🦋 Changeset detected

Latest commit: e477007

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 8 packages
Name Type
app-builder-lib Patch
dmg-builder Patch
electron-builder-squirrel-windows Patch
electron-builder Patch
electron-forge-maker-appimage Patch
electron-forge-maker-nsis-web Patch
electron-forge-maker-nsis Patch
electron-forge-maker-snap Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@netlify
Copy link

netlify bot commented Apr 14, 2022

Deploy Preview for car-park-attendant-cleat-11576 ready!

Name Link
🔨 Latest commit e477007
🔍 Latest deploy log https://app.netlify.com/sites/car-park-attendant-cleat-11576/deploys/625861d9d52a8f0008d62c91
😎 Deploy Preview https://deploy-preview-6793--car-park-attendant-cleat-11576.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@indutny-signal indutny-signal force-pushed the fix/7z-extract branch 2 times, most recently from e1c1eb6 to 1c81d64 Compare April 14, 2022 16:41
@indutny-signal indutny-signal marked this pull request as draft April 14, 2022 16:48
@indutny-signal indutny-signal marked this pull request as ready for review April 14, 2022 16:51
@indutny-signal
Copy link
Contributor Author

Sorry for ready->draft->ready transition. I've realized that I had an issue which I uncovered in testing (ABORT wasn't handled properly). Now the PR is ready for a review.

Before attempting to extract files with non-discriminating
`Nsis7z::Extract` that ignores the errors remove the temporary folder so
that we don't require twice as much disk space for this last resort
measure.

Additionally, replace `Quit` with a `Goto DoneExtract7za` so that the
last resort measure actually works.
@mmaietta mmaietta merged commit 85a3e55 into electron-userland:master Apr 15, 2022
@github-actions github-actions bot mentioned this pull request Apr 15, 2022
@indutny-signal indutny-signal deleted the fix/7z-extract branch April 18, 2022 16:55
@indutny-signal
Copy link
Contributor Author

Thanks for merging this!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants