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

chore(manager): catchup changes post migration #1847

Merged
merged 3 commits into from
Feb 21, 2024
+10 −2
Merged

chore(manager): catchup changes post migration #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7f5d66
chore(manager): catchup changes post migration
daniellacosse Feb 21, 2024
c6cc337
Update electron_builder.json
daniellacosse Feb 21, 2024
99a4580
Merge branch 'master' into daniellacosse/manager_catchup
daniellacosse Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions server_manager/electron_app/electron_builder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"win": {
"icon": "icons/win/icon.ico",
"sign": "src/server_manager/electron_app/windows/electron_builder_signing_plugin.cjs",
"sign": "server_manager/electron_app/windows/electron_builder_signing_plugin.cjs",
"signingHashAlgorithms": ["sha256"],
"target": [
{
Expand All @@ -23,12 +23,18 @@
]
},
"mac": {
"hardenedRuntime": true,
"entitlements": "server_manager/electron_app/release/macos.entitlements",
"entitlementsInherit": "server_manager/electron_app/release/macos.entitlements",
"icon": "icons/mac/icon.icns",
"target": [
{
"target": "dmg",
"arch": "universal"
}
]
],
"notarize": {
"teamId": "QT8Z3Q9V3A"
}
}
}
2 changes: 2 additions & 0 deletions server_manager/electron_app/release/macos.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<dict>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
<key>com.apple.security.cs.allow-jit</key>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this really necessary?

This says it "may" be needed, but doesn't explain when:
https://github.com/electron/notarize?tab=readme-ov-file#prerequisites

Have you tried without it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't because maybe the "may" means on certain platforms and I don't have time to test them all. We have limited time and better safe than sorry, I guess.

<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.network.server</key>
Expand Down
Loading