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: Remove adapter if core22 is set as base on snapcraft #7378

Merged
merged 2 commits into from
Jan 23, 2023
Merged

fix: Remove adapter if core22 is set as base on snapcraft #7378

merged 2 commits into from
Jan 23, 2023

Conversation

filfreire
Copy link
Contributor

@filfreire filfreire commented Jan 16, 2023

Closes #7372

cc @mmaietta

@changeset-bot
Copy link

changeset-bot bot commented Jan 16, 2023

🦋 Changeset detected

Latest commit: d467eac

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 Major
dmg-builder Major
electron-builder-squirrel-windows Major
electron-builder Major
electron-forge-maker-appimage Major
electron-forge-maker-nsis-web Major
electron-forge-maker-nsis Major
electron-forge-maker-snap Major

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 Jan 16, 2023

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

Name Link
🔨 Latest commit d467eac
🔍 Latest deploy log https://app.netlify.com/sites/car-park-attendant-cleat-11576/deploys/63cac0514d2d4c0008a75667
😎 Deploy Preview https://deploy-preview-7378--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.

@@ -71,6 +71,10 @@ export default class SnapTarget extends Target {
}
if (options.base != null) {
snap.base = options.base
// from core22 onwards adapter is legacy
if (snap.base === "core22") {
delete appDescriptor.adapter
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we need to future-proof this for core22+? This feels too hardcoded to me. Perhaps we can extract the number from core__ and compare >= 22, what are your thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed. We can change it to something like Number(snap.base.split("core")[1]) >= 22 instead?

Copy link
Collaborator

Choose a reason for hiding this comment

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

That sounds perfect.

@mmaietta mmaietta merged commit db69a18 into electron-userland:master Jan 23, 2023
@github-actions github-actions bot mentioned this pull request Mar 4, 2023
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.

Extra field 'adapter' not permitted when using core22 as base for Snapcraft configs
2 participants