mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

build: re-enable 32-bit Windows symbol generation (#34162)

Browse source
This commit is contained in:
Keeley Hammond 2022-05-11 08:27:23 -07:00 committed by GitHub
parent 6063d4f8df
commit c512993744
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
appveyor.yml
View file

@ -180,19 +180,16 @@ build_script:
- python %LOCAL_GOMA_DIR%\goma_ctl.py stat - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
- python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
- 7z a node_headers.zip out\Default\gen\node_headers - 7z a node_headers.zip out\Default\gen\node_headers
# Temporarily disable symbol generation on 32-bit Windows due to failures
- ps: >- - ps: >-
if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') { if ($env:GN_CONFIG -eq 'release') {
# Needed for msdia140.dll on 64-bit windows # Needed for msdia140.dll on 64-bit windows
$env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin" $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
ninja -C out/Default electron:electron_symbols ninja -C out/Default electron:electron_symbols
} }
- ps: >- - ps: >-
if ($env:GN_CONFIG -eq 'release') { if ($env:GN_CONFIG -eq 'release') {
if ($env:TARGET_ARCH -ne 'ia32') { python electron\script\zip-symbols.py
python electron\script\zip-symbols.py appveyor-retry appveyor PushArtifact out/Default/symbols.zip
appveyor-retry appveyor PushArtifact out/Default/symbols.zip
}
} else { } else {
# It's useful to have pdb files when debugging testing builds that are # It's useful to have pdb files when debugging testing builds that are
# built on CI. # built on CI.

5
script/release/release.js
View file

@ -128,9 +128,8 @@ function assetsForVersion (version, validatingRelease) {
`electron-${version}-mas-arm64-dsym-snapshot.zip`, `electron-${version}-mas-arm64-dsym-snapshot.zip`,
`electron-${version}-mas-arm64-symbols.zip`, `electron-${version}-mas-arm64-symbols.zip`,
`electron-${version}-mas-arm64.zip`, `electron-${version}-mas-arm64.zip`,
// TODO(jkleinsc) Symbol generation on 32-bit Windows is temporarily disabled due to failures `electron-${version}-win32-ia32-pdb.zip`,
// `electron-${version}-win32-ia32-pdb.zip`, `electron-${version}-win32-ia32-symbols.zip`,
// `electron-${version}-win32-ia32-symbols.zip`,
`electron-${version}-win32-ia32.zip`, `electron-${version}-win32-ia32.zip`,
`electron-${version}-win32-x64-pdb.zip`, `electron-${version}-win32-x64-pdb.zip`,
`electron-${version}-win32-x64-symbols.zip`, `electron-${version}-win32-x64-symbols.zip`,

14
script/release/uploaders/upload.py
View file

@ -76,10 +76,9 @@ def main():
shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip) shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip)
upload_electron(release, electron_zip, args) upload_electron(release, electron_zip, args)
if get_target_arch() != 'mips64el': if get_target_arch() != 'mips64el':
if (get_target_arch() != 'ia32' or PLATFORM != 'win32'): symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME) shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip) upload_electron(release, symbols_zip, args)
upload_electron(release, symbols_zip, args)
if PLATFORM == 'darwin': if PLATFORM == 'darwin':
if get_platform_key() == 'darwin' and get_target_arch() == 'x64': if get_platform_key() == 'darwin' and get_target_arch() == 'x64':
api_path = os.path.join(ELECTRON_DIR, 'electron-api.json') api_path = os.path.join(ELECTRON_DIR, 'electron-api.json')
@ -96,10 +95,9 @@ def main():
shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snaphot_zip) shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snaphot_zip)
upload_electron(release, dsym_snaphot_zip, args) upload_electron(release, dsym_snaphot_zip, args)
elif PLATFORM == 'win32': elif PLATFORM == 'win32':
if get_target_arch() != 'ia32': pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
pdb_zip = os.path.join(OUT_DIR, PDB_NAME) shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip) upload_electron(release, pdb_zip, args)
upload_electron(release, pdb_zip, args)
elif PLATFORM == 'linux': elif PLATFORM == 'linux':
debug_zip = os.path.join(OUT_DIR, DEBUG_NAME) debug_zip = os.path.join(OUT_DIR, DEBUG_NAME)
shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip) shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)