fix(build): temporarily test dart with dart2js instead of pub serve
Should be changed back when #4316 is resolved.
This commit is contained in:
		
							parent
							
								
									f600d88209
								
							
						
					
					
						commit
						eb7839e0ec
					
				| @ -15,14 +15,15 @@ function killServer () { | ||||
| # Serving pre-compiled dart JS takes an extra 15m. | ||||
| # So we do this only for post-commit testing. | ||||
| # Pull requests test with Dartium and pub serve | ||||
| if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then | ||||
|   # WARNING: the build/pubbuild.dart task is assumed to have been run before, in test_server_dart.sh  | ||||
| # TODO(jeffbcross): restore conditional dart2js/pubserve #4316 | ||||
| #if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then | ||||
|   # WARNING: the build/pubbuild.dart task is assumed to have been run before, in test_server_dart.sh | ||||
|   ./node_modules/.bin/gulp serve.js.dart2js& | ||||
|   serverPid=$! | ||||
| else | ||||
|   ./node_modules/.bin/gulp serve.dart& | ||||
|   serverPid=$! | ||||
| fi | ||||
| #else | ||||
| #  ./node_modules/.bin/gulp serve.dart& | ||||
| #  serverPid=$! | ||||
| #fi | ||||
| 
 | ||||
| ./node_modules/.bin/gulp build.css.material& | ||||
| 
 | ||||
|  | ||||
| @ -16,14 +16,15 @@ function killServer () { | ||||
| # Serving pre-compiled dart JS takes an extra 15m. | ||||
| # So we do this only for post-commit testing. | ||||
| # Pull requests test with Dartium and pub serve | ||||
| if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then | ||||
| # TODO(jeffbcross): restore conditional dart2js/pubserve #4316 | ||||
| #if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then | ||||
|   ./node_modules/.bin/gulp build/pubbuild.dart | ||||
|   ./node_modules/.bin/gulp serve.js.prod serve.js.dart2js& | ||||
|   serverPid=$! | ||||
| else | ||||
|   ./node_modules/.bin/gulp serve.js.prod serve.dart& | ||||
|   serverPid=$! | ||||
| fi | ||||
| #else | ||||
| #  ./node_modules/.bin/gulp serve.js.prod serve.dart& | ||||
| #  serverPid=$! | ||||
| #fi | ||||
| 
 | ||||
| trap killServer EXIT | ||||
| 
 | ||||
|  | ||||
| @ -14,14 +14,15 @@ ps -ef | grep webdriver-manager | ||||
| # Serving pre-compiled dart JS takes an extra 15m. | ||||
| # So we do this only for post-commit testing. | ||||
| # Pull requests test with Dartium and pub serve | ||||
| if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then | ||||
| # TODO(jeffbcross): restore conditional dart2js/pubserve #4316 | ||||
| #if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then | ||||
|   ./node_modules/.bin/gulp build/pubbuild.dart | ||||
|   ./node_modules/.bin/gulp serve.js.dart2js& | ||||
|   serverPid=$! | ||||
| else | ||||
|   ./node_modules/.bin/gulp serve.dart& | ||||
|   serverPid=$! | ||||
| fi | ||||
| #else | ||||
| #  ./node_modules/.bin/gulp serve.dart& | ||||
| #  serverPid=$! | ||||
| #fi | ||||
| 
 | ||||
| function killAllServers () { | ||||
|   kill $serverPid | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user