From 029d67d8b8c3494af52dc3aee4ab705d1879156a Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Thu, 7 Apr 2022 10:56:56 -0400 Subject: [PATCH 1/3] build: temporarily disable 32-bit Windows symbol generation --- appveyor.yml | 9 ++++++--- script/release/release.js | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 55bdb38d5d864..67d00a69d7e63 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -175,15 +175,18 @@ build_script: - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json - 7z a node_headers.zip out\Default\gen\node_headers - ps: >- - if ($env:GN_CONFIG -eq 'release') { + # Temporarily disable symbol generation on 32-bit Windows due to failures + if (($env:GN_CONFIG -eq 'release') -And ($env:TARGET_ARCH -ne 'ia32')) { # Needed for msdia140.dll on 64-bit windows $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin" ninja -C out/Default electron:electron_symbols } - ps: >- if ($env:GN_CONFIG -eq 'release') { - python electron\script\zip-symbols.py - appveyor-retry appveyor PushArtifact out/Default/symbols.zip + if ($env:TARGET_ARCH -ne 'ia32') { + python electron\script\zip-symbols.py + appveyor-retry appveyor PushArtifact out/Default/symbols.zip + } } else { # It's useful to have pdb files when debugging testing builds that are # built on CI. diff --git a/script/release/release.js b/script/release/release.js index 21ebbc0836aec..97873ec38c370 100755 --- a/script/release/release.js +++ b/script/release/release.js @@ -134,7 +134,8 @@ function assetsForVersion (version, validatingRelease) { `electron-${version}-mas-arm64-symbols.zip`, `electron-${version}-mas-arm64.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-x64-pdb.zip`, `electron-${version}-win32-x64-symbols.zip`, From 584b44a7d99b25f459d783a2732bbb91322c351e Mon Sep 17 00:00:00 2001 From: VerteDinde Date: Thu, 7 Apr 2022 22:43:48 -0700 Subject: [PATCH 2/3] fix: modify upload.py --- appveyor.yml | 10 ++++------ script/release/uploaders/upload.py | 14 ++++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 67d00a69d7e63..2f686acbf2de0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -176,17 +176,15 @@ build_script: - 7z a node_headers.zip out\Default\gen\node_headers - ps: >- # Temporarily disable symbol generation on 32-bit Windows due to failures - if (($env:GN_CONFIG -eq 'release') -And ($env:TARGET_ARCH -ne 'ia32')) { + if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') { # Needed for msdia140.dll on 64-bit windows $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin" ninja -C out/Default electron:electron_symbols } - ps: >- - if ($env:GN_CONFIG -eq 'release') { - if ($env:TARGET_ARCH -ne 'ia32') { - python electron\script\zip-symbols.py - appveyor-retry appveyor PushArtifact out/Default/symbols.zip - } + if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') { + python electron\script\zip-symbols.py + appveyor-retry appveyor PushArtifact out/Default/symbols.zip } else { # It's useful to have pdb files when debugging testing builds that are # built on CI. diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py index 014d7c53749b4..c3f860603624a 100755 --- a/script/release/uploaders/upload.py +++ b/script/release/uploaders/upload.py @@ -76,9 +76,10 @@ def main(): shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip) upload_electron(release, electron_zip, args) if get_target_arch() != 'mips64el': - symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME) - shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip) - upload_electron(release, symbols_zip, args) + if get_target_arch() != 'ia32' and PLATFORM != 'win32': + symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME) + shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip) + upload_electron(release, symbols_zip, args) if PLATFORM == 'darwin': if get_platform_key() == 'darwin' and get_target_arch() == 'x64': 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) upload_electron(release, dsym_snaphot_zip, args) elif PLATFORM == 'win32': - pdb_zip = os.path.join(OUT_DIR, PDB_NAME) - shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip) - upload_electron(release, pdb_zip, args) + if get_target_arch() != 'ia32': + pdb_zip = os.path.join(OUT_DIR, PDB_NAME) + shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip) + upload_electron(release, pdb_zip, args) elif PLATFORM == 'linux': debug_zip = os.path.join(OUT_DIR, DEBUG_NAME) shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip) From a979e877a729647607db25a698ab84f11040cb38 Mon Sep 17 00:00:00 2001 From: VerteDinde Date: Fri, 8 Apr 2022 01:40:24 -0700 Subject: [PATCH 3/3] chore: fix comment --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2f686acbf2de0..8839a999a9659 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -174,8 +174,8 @@ build_script: - python %LOCAL_GOMA_DIR%\goma_ctl.py stat - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json - 7z a node_headers.zip out\Default\gen\node_headers + # Temporarily disable symbol generation on 32-bit Windows due to failures - ps: >- - # Temporarily disable symbol generation on 32-bit Windows due to failures if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') { # Needed for msdia140.dll on 64-bit windows $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"