build: build & release libcxx objects on darwin (#34586)

* build: build & release libcxx objects on darwin * Fix merge error Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
electron · Jun 21, 2022 · 51a5a8c · 51a5a8c
1 parent 140c8d0
commit 51a5a8c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
@@ -794,8 +794,8 @@ step-maybe-generate-libcxx: &step-maybe-generate-libcxx
       if [ "`uname`" == "Linux" ]; then
         ninja -C out/Default electron:libcxx_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
         ninja -C out/Default electron:libcxxabi_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
-        ninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
       fi
+      ninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
 
 step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
   run:

diff --git a/script/release/release.js b/script/release/release.js
@@ -146,6 +146,8 @@ function assetsForVersion (version, validatingRelease) {
     `libcxx-objects-${version}-linux-arm64.zip`,
     `libcxx-objects-${version}-linux-armv7l.zip`,
     `libcxx-objects-${version}-linux-x64.zip`,
+    `libcxx-objects-${version}-darwin-x64.zip`,
+    `libcxx-objects-${version}-darwin-arm64.zip`,
     `ffmpeg-${version}-darwin-x64.zip`,
     `ffmpeg-${version}-darwin-arm64.zip`,
     `ffmpeg-${version}-linux-arm64.zip`,

diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
@@ -94,7 +94,13 @@ def main():
 
     dsym_snapshot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snapshot_zip)
-    upload_electron(release, dsym_snapshot_zip, args)    
+    upload_electron(release, dsym_snapshot_zip, args)
+
+    libcxx_objects = get_zip_name('libcxx-objects', ELECTRON_VERSION)
+    libcxx_objects_zip = os.path.join(OUT_DIR, libcxx_objects)
+    shutil.copy2(os.path.join(OUT_DIR, 'libcxx_objects.zip'),
+        libcxx_objects_zip)
+    upload_electron(release, libcxx_objects_zip, args)
   elif PLATFORM == 'win32':
     if get_target_arch() != 'ia32':
       pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
@@ -105,7 +111,6 @@ def main():
     shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)
     upload_electron(release, debug_zip, args)
 
-    # Upload libcxx_objects.zip for linux only
     libcxx_objects = get_zip_name('libcxx-objects', ELECTRON_VERSION)
     libcxx_objects_zip = os.path.join(OUT_DIR, libcxx_objects)
     shutil.copy2(os.path.join(OUT_DIR, 'libcxx_objects.zip'),