Browse Source

chore: modify uploaded assets for win-ia32 (#33699)

* chore: filter correct symbol files

* chore: upload correct assets
Keeley Hammond 3 years ago
parent
commit
41c1a7e318
3 changed files with 7 additions and 5 deletions
  1. 5 3
      appveyor.yml
  2. 1 1
      script/release/release.js
  3. 1 1
      script/release/uploaders/upload.py

+ 5 - 3
appveyor.yml

@@ -182,9 +182,11 @@ build_script:
         ninja -C out/Default electron:electron_symbols
       }
   - ps: >-
-      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
+      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
+        }
       } else {
         # It's useful to have pdb files when debugging testing builds that are
         # built on CI.

+ 1 - 1
script/release/release.js

@@ -133,8 +133,8 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-mas-arm64-dsym-snapshot.zip`,
     `electron-${version}-mas-arm64-symbols.zip`,
     `electron-${version}-mas-arm64.zip`,
-    `electron-${version}-win32-ia32-pdb.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-symbols.zip`,
     `electron-${version}-win32-ia32.zip`,
     `electron-${version}-win32-x64-pdb.zip`,

+ 1 - 1
script/release/uploaders/upload.py

@@ -76,7 +76,7 @@ def main():
   shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip)
   upload_electron(release, electron_zip, args)
   if get_target_arch() != 'mips64el':
-    if get_target_arch() != 'ia32' and PLATFORM != 'win32':
+    if (get_target_arch() != 'ia32' or 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)