mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* build: build & release libcxx objects on darwin

* Fix merge error

Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
This commit is contained in:
Keeley Hammond 2022-06-20 18:35:16 -07:00 committed by GitHub
parent 3cd5223134
commit 2bbbc66eb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.circleci/config/base.yml
View file

@ -794,8 +794,8 @@ step-maybe-generate-libcxx: &step-maybe-generate-libcxx
if [ "`uname`" == "Linux" ]; then if [ "`uname`" == "Linux" ]; then
ninja -C out/Default electron:libcxx_headers_zip -j $NUMBER_OF_NINJA_PROCESSES 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:libcxxabi_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
ninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
fi fi
ninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
run: run:

2
script/release/release.js
View file

@ -146,6 +146,8 @@ function assetsForVersion (version, validatingRelease) {
`libcxx-objects-${version}-linux-arm64.zip`, `libcxx-objects-${version}-linux-arm64.zip`,
`libcxx-objects-${version}-linux-armv7l.zip`, `libcxx-objects-${version}-linux-armv7l.zip`,
`libcxx-objects-${version}-linux-x64.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-x64.zip`,
`ffmpeg-${version}-darwin-arm64.zip`, `ffmpeg-${version}-darwin-arm64.zip`,
`ffmpeg-${version}-linux-arm64.zip`, `ffmpeg-${version}-linux-arm64.zip`,

9
script/release/uploaders/upload.py
View file

@ -94,7 +94,13 @@ def main():
dsym_snapshot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME) dsym_snapshot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME)
shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snapshot_zip) 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': elif PLATFORM == 'win32':
if get_target_arch() != 'ia32': if get_target_arch() != 'ia32':
pdb_zip = os.path.join(OUT_DIR, PDB_NAME) 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) shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)
upload_electron(release, debug_zip, args) upload_electron(release, debug_zip, args)
# Upload libcxx_objects.zip for linux only
libcxx_objects = get_zip_name('libcxx-objects', ELECTRON_VERSION) libcxx_objects = get_zip_name('libcxx-objects', ELECTRON_VERSION)
libcxx_objects_zip = os.path.join(OUT_DIR, libcxx_objects) libcxx_objects_zip = os.path.join(OUT_DIR, libcxx_objects)
shutil.copy2(os.path.join(OUT_DIR, 'libcxx_objects.zip'), shutil.copy2(os.path.join(OUT_DIR, 'libcxx_objects.zip'),