chore: fix ffmpeg upload path and always generate node headers
This commit is contained in:
parent
851cd22f10
commit
9ec7137443
2 changed files with 3 additions and 2 deletions
|
@ -31,6 +31,7 @@ build_script:
|
|||
- ninja -C out/Default electron:electron_dist_zip
|
||||
- ninja -C out/Default electron:electron_mksnapshot_zip
|
||||
- ninja -C out/Default electron:electron_chromedriver_zip
|
||||
- ninja -C out/Default third_party/electron_node:headers
|
||||
- appveyor PushArtifact out/Default/dist.zip
|
||||
- appveyor PushArtifact out/Default/chromedriver.zip
|
||||
|
||||
|
@ -49,7 +50,6 @@ test_script:
|
|||
- if "%GN_CONFIG%"=="testing" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
|
||||
- ps: >-
|
||||
if ($env:GN_CONFIG -eq 'testing') {
|
||||
ninja -C out/Default third_party/electron_node:headers
|
||||
New-Item .\out\Default\gen\node_headers\Release -Type directory
|
||||
Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib
|
||||
} else {
|
||||
|
|
|
@ -84,7 +84,8 @@ def main():
|
|||
# Upload free version of ffmpeg.
|
||||
ffmpeg = get_zip_name('ffmpeg', ELECTRON_VERSION)
|
||||
ffmpeg_zip = os.path.join(OUT_DIR, ffmpeg)
|
||||
shutil.copy2(os.path.join(OUT_DIR, 'ffmpeg.zip'), ffmpeg_zip)
|
||||
ffmpeg_build_path = os.path.join(GN_SRC_DIR, 'out', 'ffmpeg', 'ffmpeg.zip')
|
||||
shutil.copy2(ffmpeg_build_path, ffmpeg_zip)
|
||||
upload_electron(release, ffmpeg_zip, args)
|
||||
|
||||
chromedriver = get_zip_name('chromedriver', ELECTRON_VERSION)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue