Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1563 from spicyj/travis-no-sauce

Browse Source 
Don't fail Travis on sauce failures
This commit is contained in:
Paul O’Shannessy
2014-05-19 13:28:09 -07:00
parent ab58ecefa7 8db8e60a38
commit 5933d97cb6
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+4 -2
View File
@@ -7,7 +7,7 @@ script:
grunt $TEST_TYPE
after_script:
- |
if [ "$TEST_TYPE" = test:full ] && [ "$SERVER" ]; then
if [ "$TEST_TYPE" = test ] && [ "$SERVER" ]; then
grunt build
curl \
-F "react=@build/react.js" \
@@ -26,10 +26,11 @@ after_script:
fi
env:
matrix:
- TEST_TYPE=test:full
- TEST_TYPE=test
- TEST_TYPE=lint
- TEST_TYPE=perf:full
- TEST_TYPE=test:coverage
- TEST_TYPE=test:webdriver:saucelabs:modern
- TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
- TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
- TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
@@ -47,6 +48,7 @@ matrix:
- env: TEST_TYPE=lint
- env: TEST_TYPE=test:coverage
- env: TEST_TYPE=perf:full
- env: TEST_TYPE=test:webdriver:saucelabs:modern
- env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
- env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
- env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
Gruntfile.js
+11
View File
@@ -149,6 +149,17 @@ module.exports = function(grunt) {
'webdriver-jasmine:saucelabs_' + (process.env.BROWSER_NAME || 'ie8')
]);
grunt.registerTask('test:webdriver:saucelabs:modern', [
'build:test',
'build:basic',
'connect',
'sauce-tunnel',
'webdriver-jasmine:saucelabs_android',
'webdriver-jasmine:saucelabs_firefox',
'webdriver-jasmine:saucelabs_chrome'
]);
grunt.registerTask('test:webdriver:saucelabs:ie', [
'build:test',
'build:basic',