Skip to content

Commit 34fc53e

Browse files
VerteDindeVerteDinde
authored
chore: Revert "build: build & release libcxx objects on darwin (#34586)" (#34680)
Revert "build: build & release libcxx objects on darwin (#34586)" This reverts commit 2bbbc66.
1 parent 528cbe8 commit 34fc53e

3 files changed

Lines changed: 3 additions & 10 deletions

File tree

‎.circleci/config/base.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,8 +794,8 @@ step-maybe-generate-libcxx: &step-maybe-generate-libcxx
794794
if [ "`uname`" == "Linux" ]; then
795795
ninja -C out/Default electron:libcxx_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
796796
ninja -C out/Default electron:libcxxabi_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
797+
ninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
797798
fi
798-
ninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
799799
800800
step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
801801
run:

‎script/release/release.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ function assetsForVersion (version, validatingRelease) {
146146
`libcxx-objects-${version}-linux-arm64.zip`,
147147
`libcxx-objects-${version}-linux-armv7l.zip`,
148148
`libcxx-objects-${version}-linux-x64.zip`,
149-
`libcxx-objects-${version}-darwin-x64.zip`,
150-
`libcxx-objects-${version}-darwin-arm64.zip`,
151149
`ffmpeg-${version}-darwin-x64.zip`,
152150
`ffmpeg-${version}-darwin-arm64.zip`,
153151
`ffmpeg-${version}-linux-arm64.zip`,

‎script/release/uploaders/upload.py‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,7 @@ def main():
9494

9595
dsym_snapshot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME)
9696
shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snapshot_zip)
97-
upload_electron(release, dsym_snapshot_zip, args)
98-
99-
libcxx_objects = get_zip_name('libcxx-objects', ELECTRON_VERSION)
100-
libcxx_objects_zip = os.path.join(OUT_DIR, libcxx_objects)
101-
shutil.copy2(os.path.join(OUT_DIR, 'libcxx_objects.zip'),
102-
libcxx_objects_zip)
103-
upload_electron(release, libcxx_objects_zip, args)
97+
upload_electron(release, dsym_snapshot_zip, args)
10498
elif PLATFORM == 'win32':
10599
if get_target_arch() != 'ia32':
106100
pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
@@ -111,6 +105,7 @@ def main():
111105
shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)
112106
upload_electron(release, debug_zip, args)
113107

108+
# Upload libcxx_objects.zip for linux only
114109
libcxx_objects = get_zip_name('libcxx-objects', ELECTRON_VERSION)
115110
libcxx_objects_zip = os.path.join(OUT_DIR, libcxx_objects)
116111
shutil.copy2(os.path.join(OUT_DIR, 'libcxx_objects.zip'),

0 commit comments

Comments
 (0)