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

Hard code the chromedriver's version

Browse source 
It is not possible to run chromedriver for all targets.
This commit is contained in:
Cheng Zhao 2015-07-08 12:32:47 +08:00
parent cb92df687d
commit b7cdb00d09
4 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
script/create-dist.py
View file

@ -8,9 +8,9 @@ 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_target_arch, get_chromedriver_version
from lib.util import scoped_cwd, rm_rf, get_atom_shell_version, make_zip, \ from lib.util import scoped_cwd, rm_rf, get_atom_shell_version, make_zip, \
execute, get_chromedriver_version, atom_gyp execute, atom_gyp
ATOM_SHELL_VERSION = get_atom_shell_version() ATOM_SHELL_VERSION = get_atom_shell_version()
@ -96,8 +96,7 @@ def main():
create_version() create_version()
create_dist_zip() create_dist_zip()
if target_arch != 'arm': create_chrome_binary_zip('chromedriver', get_chromedriver_version())
create_chrome_binary_zip('chromedriver', get_chromedriver_version())
create_chrome_binary_zip('mksnapshot', ATOM_SHELL_VERSION) create_chrome_binary_zip('mksnapshot', ATOM_SHELL_VERSION)
create_symbols_zip() create_symbols_zip()

4
script/lib/config.py
View file

@ -37,6 +37,10 @@ def get_target_arch():
return 'x64' return 'x64'
def get_chromedriver_version():
return 'v2.15'
def s3_config(): def s3_config():
config = (os.environ.get('ATOM_SHELL_S3_BUCKET', ''), config = (os.environ.get('ATOM_SHELL_S3_BUCKET', ''),
os.environ.get('ATOM_SHELL_S3_ACCESS_KEY', ''), os.environ.get('ATOM_SHELL_S3_ACCESS_KEY', ''),

7
script/lib/util.py
View file

@ -190,13 +190,6 @@ def get_atom_shell_version():
return 'v' + atom_gyp()['version%'] return 'v' + atom_gyp()['version%']
def get_chromedriver_version():
SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
chromedriver = os.path.join(SOURCE_ROOT, 'dist', 'chromedriver')
output = subprocess.check_output([chromedriver, '-v']).strip()
return 'v' + output[13:output.rfind(' ')]
def parse_version(version): def parse_version(version):
if version[0] == 'v': if version[0] == 'v':
version = version[1:] version = version[1:]

6
script/upload.py
View file

@ -7,9 +7,9 @@ import subprocess
import sys import sys
import tempfile import tempfile
from lib.config import PLATFORM, get_target_arch from lib.config import PLATFORM, get_target_arch, get_chromedriver_version
from lib.util import atom_gyp, execute, get_atom_shell_version, parse_version, \ from lib.util import atom_gyp, execute, get_atom_shell_version, parse_version, \
get_chromedriver_version, scoped_cwd scoped_cwd
from lib.github import GitHub from lib.github import GitHub
@ -83,7 +83,7 @@ def main():
upload_atom_shell(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME)) upload_atom_shell(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME))
# Upload chromedriver and mksnapshot for minor version update. # Upload chromedriver and mksnapshot for minor version update.
if get_target_arch() != 'arm' and parse_version(args.version)[2] == '0': if parse_version(args.version)[2] == '0':
chromedriver = 'chromedriver-{0}-{1}-{2}.zip'.format( chromedriver = 'chromedriver-{0}-{1}-{2}.zip'.format(
get_chromedriver_version(), PLATFORM, get_target_arch()) get_chromedriver_version(), PLATFORM, get_target_arch())
upload_atom_shell(github, release, os.path.join(DIST_DIR, chromedriver)) upload_atom_shell(github, release, os.path.join(DIST_DIR, chromedriver))