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

Merge pull request #8682 from electron/use-electron-version-in-chromedriver-asset-name

Browse source 
Use electron version in Chromedriver asset name
This commit is contained in:
Kevin Sawicki 2017-02-15 08:28:43 -08:00 committed by GitHub
commit 0ac3969c6a
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
script/create-dist.py
View file

@ -9,8 +9,7 @@ import sys
import stat import stat
from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \ from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \
get_target_arch, get_chromedriver_version, \ get_target_arch, get_zip_name
get_zip_name
from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \ from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \
execute, electron_gyp execute, electron_gyp
@ -94,7 +93,7 @@ def main():
create_version() create_version()
create_dist_zip() create_dist_zip()
create_chrome_binary_zip('chromedriver', get_chromedriver_version()) create_chrome_binary_zip('chromedriver', ELECTRON_VERSION)
create_chrome_binary_zip('mksnapshot', ELECTRON_VERSION) create_chrome_binary_zip('mksnapshot', ELECTRON_VERSION)
create_ffmpeg_zip() create_ffmpeg_zip()
create_symbols_zip() create_symbols_zip()

3
script/lib/config.py
View file

@ -42,9 +42,6 @@ def get_target_arch():
return 'x64' return 'x64'
def get_chromedriver_version():
return 'v2.21'
def get_env_var(name): def get_env_var(name):
value = os.environ.get('ELECTRON_' + name, '') value = os.environ.get('ELECTRON_' + name, '')
if not value: if not value:

6
script/upload.py
View file

@ -10,8 +10,8 @@ import sys
import tempfile import tempfile
from io import StringIO from io import StringIO
from lib.config import PLATFORM, get_target_arch, get_chromedriver_version, \ from lib.config import PLATFORM, get_target_arch, get_env_var, s3_config, \
get_env_var, s3_config, get_zip_name get_zip_name
from lib.util import electron_gyp, execute, get_electron_version, \ from lib.util import electron_gyp, execute, get_electron_version, \
parse_version, scoped_cwd, s3put parse_version, scoped_cwd, s3put
from lib.github import GitHub from lib.github import GitHub
@ -91,7 +91,7 @@ def main():
# Upload chromedriver and mksnapshot for minor version update. # Upload chromedriver and mksnapshot for minor version update.
if parse_version(args.version)[2] == '0': if parse_version(args.version)[2] == '0':
chromedriver = get_zip_name('chromedriver', get_chromedriver_version()) chromedriver = get_zip_name('chromedriver', ELECTRON_VERSION)
upload_electron(github, release, os.path.join(DIST_DIR, chromedriver)) upload_electron(github, release, os.path.join(DIST_DIR, chromedriver))
mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION) mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot)) upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot))