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

Don't install ubuntu test toolchain

Browse source
This commit is contained in:
Cheng Zhao 2015-07-02 01:12:21 +00:00
parent 7b955fe829
commit 62a5159e72
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
script/cibuild
View file

@ -15,8 +15,6 @@ LINUX_DEPS = [
'libgnome-keyring-dev', 'libgnome-keyring-dev',
'libgtk2.0-dev', 'libgtk2.0-dev',
'libnotify-dev', 'libnotify-dev',
'gcc-4.8',
'g++-4.8',
'gcc-multilib', 'gcc-multilib',
'g++-multilib', 'g++-multilib',
] ]
@ -28,7 +26,6 @@ def main():
is_travis = (os.getenv('TRAVIS') == 'true') is_travis = (os.getenv('TRAVIS') == 'true')
if is_travis and sys.platform == 'linux2': if is_travis and sys.platform == 'linux2':
print 'Setup travis CI' print 'Setup travis CI'
execute(['sudo', 'add-apt-repository', '-y', 'ppa:ubuntu-toolchain-r/test'])
execute(['sudo', 'apt-get', 'update']) execute(['sudo', 'apt-get', 'update'])
execute(['sudo', 'apt-get', 'install'] + LINUX_DEPS) execute(['sudo', 'apt-get', 'install'] + LINUX_DEPS)
@ -44,8 +41,9 @@ def main():
'libchromiumcontent')) 'libchromiumcontent'))
if is_travis and sys.platform == 'linux2': if is_travis and sys.platform == 'linux2':
with scoped_env('CXX', 'g++-4.8'): with scoped_env('GYP_DEFINES', 'clang=1'):
with scoped_env('CC', 'gcc-4.8'): with scoped_env('CXX', 'clang++'):
with scoped_env('CC', 'clang'):
run_script('bootstrap.py', ['--dev']) run_script('bootstrap.py', ['--dev'])
run_script('update.py') run_script('update.py')
else: else: