diff --git a/.travis.yml b/.travis.yml index af27529cdc..ff7272e3e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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' diff --git a/script/lib/config.py b/script/lib/config.py index 65289fb0a2..b7407fd0f4 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -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', diff --git a/vendor/brightray b/vendor/brightray index 713bc65074..706799700b 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 713bc650744c3ed987499f64743977c739f11186 +Subproject commit 706799700b6cbdd8c6657e7253f0395b38412d57