From 6ce7c22a8abc8293e520e7077cde0466e6e78150 Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Tue, 21 Jun 2022 09:06:50 -0700 Subject: [PATCH] chore: Revert "build: build & release libcxx objects on darwin (#34586)" (#34680) Revert "build: build & release libcxx objects on darwin (#34586)" This reverts commit 2bbbc66eb83b42041d768ea64f5ada9ed1ffd301. --- .circleci/config/base.yml | 2 +- script/release/release.js | 2 -- script/release/uploaders/upload.py | 9 ++------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index 3716c7545b99e..d74742fc20a59 100644 --- 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 index 298e7622b720e..e89d7ba920245 100755 --- a/script/release/release.js +++ b/script/release/release.js @@ -146,8 +146,6 @@ 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 index b9f74511323c2..caaa726d55d8a 100755 --- a/script/release/uploaders/upload.py +++ b/script/release/uploaders/upload.py @@ -94,13 +94,7 @@ 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) - - 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) + upload_electron(release, dsym_snapshot_zip, args) elif PLATFORM == 'win32': if get_target_arch() != 'ia32': pdb_zip = os.path.join(OUT_DIR, PDB_NAME) @@ -111,6 +105,7 @@ 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'),