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

Merge pull request #2128 from atom/no-openssl

Browse source 
Don't force using OpenSSL on linux
This commit is contained in:
Cheng Zhao 2015-07-06 15:18:57 +08:00
commit 7042054913
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -17,5 +17,8 @@ matrix:
env: TARGET_ARCH=arm env: TARGET_ARCH=arm
- os: linux - os: linux
env: TARGET_ARCH=ia32 env: TARGET_ARCH=ia32
allow_failures:
- env: TARGET_ARCH=arm
- env: TARGET_ARCH=ia32
script: './script/cibuild' script: './script/cibuild'

2
script/lib/config.py
View file

@ -8,7 +8,7 @@ import sys
BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent' 'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent'
LIBCHROMIUMCONTENT_COMMIT = 'a4410de75315f3ecc00db2314bfab184dcd914f8' LIBCHROMIUMCONTENT_COMMIT = 'e4505342f14c0131d64a5fd523485ef93df92050'
PLATFORM = { PLATFORM = {
'cygwin': 'win32', 'cygwin': 'win32',

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 713bc650744c3ed987499f64743977c739f11186 Subproject commit 706799700b6cbdd8c6657e7253f0395b38412d57