Skip to content

Commit

Permalink
fix: avoid Electron.dsym files in the main app bundle (#21447) (#21487)
Browse files Browse the repository at this point in the history
* ci: CHECK_DIST_MANIFEST in release builds

* fix: skip Electron.dSYM on macOS app zip
  • Loading branch information
deepak1556 authored and zcbenz committed Dec 12, 2019
1 parent 281b074 commit 8f728af
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Expand Up @@ -41,6 +41,7 @@ env-release-build: &env-release-build
GN_CONFIG: //electron/build/args/release.gn
STRIP_BINARIES: true
GENERATE_SYMBOLS: true
CHECK_DIST_MANIFEST: '1'

env-headless-testing: &env-headless-testing
DISPLAY: ':99.0'
Expand Down
9 changes: 6 additions & 3 deletions build/zip.py
Expand Up @@ -16,6 +16,10 @@
'./libVkICD_mock_', #Skipping because these are outputs that we don't need
'./VkICD_mock_', #Skipping because these are outputs that we don't need

# Skipping because its an output of create_bundle from //build/config/mac/rules.gni
# that we don't need
'Electron.dSYM',

# //chrome/browser:resources depends on this via
# //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to
# ship it.
Expand Down Expand Up @@ -51,14 +55,13 @@ def main(argv):
with open(runtime_deps) as f:
for dep in f.readlines():
dep = dep.strip()
dist_files.add(dep)
if not skip_path(dep, dist_zip, target_cpu):
dist_files.add(dep)
if sys.platform == 'darwin':
execute(['zip', '-r', '-y', dist_zip] + list(dist_files))
else:
with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED, allowZip64=True) as z:
for dep in dist_files:
if skip_path(dep, dist_zip, target_cpu):
continue
if os.path.isdir(dep):
for root, dirs, files in os.walk(dep):
for file in files:
Expand Down

0 comments on commit 8f728af

Please sign in to comment.