mirror of
https://github.com/electron/electron.git
synced 2026-01-23 22:38:18 -05:00
Merge pull request #2128 from atom/no-openssl
Don't force using OpenSSL on linux
This commit is contained in:
@@ -17,5 +17,8 @@ matrix:
|
||||
env: TARGET_ARCH=arm
|
||||
- os: linux
|
||||
env: TARGET_ARCH=ia32
|
||||
allow_failures:
|
||||
- env: TARGET_ARCH=arm
|
||||
- env: TARGET_ARCH=ia32
|
||||
|
||||
script: './script/cibuild'
|
||||
|
||||
@@ -8,7 +8,7 @@ import sys
|
||||
|
||||
BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
|
||||
'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent'
|
||||
LIBCHROMIUMCONTENT_COMMIT = 'a4410de75315f3ecc00db2314bfab184dcd914f8'
|
||||
LIBCHROMIUMCONTENT_COMMIT = 'e4505342f14c0131d64a5fd523485ef93df92050'
|
||||
|
||||
PLATFORM = {
|
||||
'cygwin': 'win32',
|
||||
|
||||
2
vendor/brightray
vendored
2
vendor/brightray
vendored
Submodule vendor/brightray updated: 713bc65074...706799700b
Reference in New Issue
Block a user