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

build: temporarily disable 32-bit Windows symbol generation (#33653)

Browse source 
* build: temporarily disable 32-bit Windows symbol generation

* fix: modify upload.py

* chore: fix comment

Co-authored-by: VerteDinde <vertedinde@electronjs.org>
This commit is contained in:
John Kleinschmidt 2022-04-08 07:17:51 -04:00 • committed by GitHub
parent 4d4682c0e3
commit 94c2a7671c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
appveyor.yml
View file

@ -174,14 +174,15 @@ build_script:
- python %LOCAL_GOMA_DIR%\goma_ctl.py stat - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
- python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json - python 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') { if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') {
# 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' -And $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 {

3
script/release/release.js
View file

@ -134,7 +134,8 @@ function assetsForVersion (version, validatingRelease) {
`electron-${version}-mas-arm64-symbols.zip`, `electron-${version}-mas-arm64-symbols.zip`,
`electron-${version}-mas-arm64.zip`, `electron-${version}-mas-arm64.zip`,
`electron-${version}-win32-ia32-pdb.zip`, `electron-${version}-win32-ia32-pdb.zip`,
`electron-${version}-win32-ia32-symbols.zip`, // TODO(jkleinsc) Symbol generation on 32-bit Windows is temporarily disabled due to failures
// `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,9 +76,10 @@ 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':
symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME) if get_target_arch() != 'ia32' and PLATFORM != 'win32':
shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip) symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
upload_electron(release, symbols_zip, args) shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
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')
@ -95,9 +96,10 @@ 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':
pdb_zip = os.path.join(OUT_DIR, PDB_NAME) if get_target_arch() != 'ia32':
shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip) pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
upload_electron(release, pdb_zip, args) shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
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)