Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use electron version in Chromedriver asset name #8682

Merged
merged 1 commit into from Feb 15, 2017
Merged

Use electron version in Chromedriver asset name #8682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions script/create-dist.py
View file
Open in desktop
Expand Up @@ -9,8 +9,7 @@
import stat

from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \
get_target_arch, get_chromedriver_version, \
get_zip_name
get_target_arch, get_zip_name
from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \
execute, electron_gyp

Expand Down Expand Up @@ -94,7 +93,7 @@ def main():

create_version()
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_ffmpeg_zip()
create_symbols_zip()
Expand Down
3 changes: 0 additions & 3 deletions script/lib/config.py
View file
Open in desktop
Expand Up @@ -42,9 +42,6 @@ def get_target_arch():
return 'x64'


def get_chromedriver_version():
return 'v2.21'

def get_env_var(name):
value = os.environ.get('ELECTRON_' + name, '')
if not value:
Expand Down
6 changes: 3 additions & 3 deletions script/upload.py
View file
Open in desktop
Expand Up @@ -10,8 +10,8 @@
import tempfile

from io import StringIO
from lib.config import PLATFORM, get_target_arch, get_chromedriver_version, \
get_env_var, s3_config, get_zip_name
from lib.config import PLATFORM, get_target_arch, get_env_var, s3_config, \
get_zip_name
from lib.util import electron_gyp, execute, get_electron_version, \
parse_version, scoped_cwd, s3put
from lib.github import GitHub
Expand Down Expand Up @@ -91,7 +91,7 @@ def main():

# Upload chromedriver and mksnapshot for minor version update.
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))
mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot))
Expand Down