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: avoid Electron.dsym files in the main app bundle #21447

Merged
merged 2 commits into from Dec 11, 2019

Conversation

deepak1556
Copy link
Member

@deepak1556 deepak1556 commented Dec 9, 2019

Description of Change

Screenshot (51)

This regressed since v7

Checklist

Release Notes

Notes: remove Electron.dsym from macOS application zip

@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Dec 9, 2019
@deepak1556
Copy link
Member Author

Only enabled the dist checks, haven't fixed the issue yet.

@deepak1556
Copy link
Member Author

The regression came from https://chromium-review.googlesource.com/c/chromium/src/+/1671667, the following would do the trick

diff --git a/build/config/mac/rules.gni b/build/config/mac/rules.gni
index 3c816242375c..9b8bee7b4855 100644
--- a/build/config/mac/rules.gni
+++ b/build/config/mac/rules.gni
@@ -351,7 +351,7 @@ template("mac_framework_bundle") {
       ":$_shared_library_bundle_data",
     ]
 
-    if (enable_dsyms) {
+    if (enable_dsyms && !is_electron_build) {
       data = [
         "$root_out_dir/$_output_name.dSYM/Contents/Info.plist",
         "$root_out_dir/$_output_name.dSYM/Contents/Resources/DWARF/$_output_name",
@@ -559,7 +559,7 @@ template("mac_app_bundle") {
       deps += [ ":$_pkg_info_bundle_data" ]
     }
 
-    if (enable_dsyms) {
+    if (enable_dsyms && !is_electron_build) {
       data = [
         "$root_out_dir/$_output_name.dSYM/Contents/Info.plist",
         "$root_out_dir/$_output_name.dSYM/Contents/Resources/DWARF/$_output_name",
@@ -632,7 +632,7 @@ template("mac_plugin_bundle") {
     }
     deps += [ ":$_loadable_module_bundle_data" ]
 
-    if (enable_dsyms) {
+    if (enable_dsyms && !is_electron_build) {
       data = [
         "$root_out_dir/$_output_name.so.dSYM/Contents/Info.plist",
         "$root_out_dir/$_output_name.so.dSYM/Contents/Resources/DWARF/$_output_name.so",

since I don't want to mess the runtime_deps by manipulating data, data_deps without patch. But open to other solutions.

@nornagon
Copy link
Member

Probably better to just exclude them in our zip code: https://github.com/electron/electron/blob/master/build/zip.py#L14-L23

@deepak1556
Copy link
Member Author

@nornagon updated, can we trigger release builds for this PR before merging ?

@nornagon
Copy link
Member

i can't trigger release builds but @jkleinsc can! i've pinged him.

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Dec 10, 2019
@jkleinsc
Copy link
Contributor

Mac release builds have been triggered.

@deepak1556
Copy link
Member Author

Build artifacts looks good, ready for review.

Copy link
Contributor

@jkleinsc jkleinsc left a comment

Choose a reason for hiding this comment

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

LGTM

@jkleinsc
Copy link
Contributor

Merging as CI failures are unrelated to PR change.

@jkleinsc jkleinsc merged commit aa4b36a into master Dec 11, 2019
@release-clerk
Copy link

release-clerk bot commented Dec 11, 2019

Release Notes Persisted

remove Electron.dsym from macOS application zip

@jkleinsc jkleinsc deleted the robo/fix_macos_release_dist branch December 11, 2019 17:43
@trop
Copy link
Contributor

trop bot commented Dec 11, 2019

I was unable to backport this PR to "7-1-x" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

trop bot commented Dec 11, 2019

I have automatically backported this PR to "8-x-y", please check out #21484

@trop trop bot removed the target/8-x-y label Dec 11, 2019
deepak1556 added a commit that referenced this pull request Dec 11, 2019
* ci: CHECK_DIST_MANIFEST in release builds

* fix: skip Electron.dSYM on macOS app zip
@trop
Copy link
Contributor

trop bot commented Dec 11, 2019

@deepak1556 has manually backported this PR to "7-1-x", please check out #21487

zcbenz pushed a commit that referenced this pull request Dec 12, 2019
* ci: CHECK_DIST_MANIFEST in release builds

* fix: skip Electron.dSYM on macOS app zip
@sofianguy sofianguy added this to Fixed in 8.0.0-beta.5 in 8.2.x Jan 14, 2020
@sofianguy sofianguy added this to Fixed in 7.1.5 in 7.2.x Jan 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
7.2.x
Fixed in 7.1.5
8.2.x
Fixed in 8.0.0-beta.5
Development

Successfully merging this pull request may close these issues.

None yet

4 participants