From ba5e3a81e05c48366820e399d9e695d83374e06d Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Thu, 1 Sep 2016 11:21:24 -0700 Subject: [PATCH] Updating travis This closes #328 --- .travis.yml | 8 +++++++- spec/e2e/create.spec.js | 2 +- spec/e2e/update.spec.js | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91d179f4..f25ad956 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,18 @@ language: android sudo: false +jdk: + - oraclejdk8 before_install: - nvm install 6 - node --version install: - npm install - npm install -g codecov - - echo y | android update sdk -u --filter android-22,android-23 + - echo y | android update sdk -u --filter android-22,android-23,android-24 +android: + components: + - tools + - tools script: - npm run jshint - npm run cover diff --git a/spec/e2e/create.spec.js b/spec/e2e/create.spec.js index 805378de..2f5822a8 100644 --- a/spec/e2e/create.spec.js +++ b/spec/e2e/create.spec.js @@ -19,7 +19,7 @@ var actions = require('./helpers/projectActions.js'); -var CREATE_TIMEOUT = 60000; +var CREATE_TIMEOUT = 90000; function createAndBuild(projectname, projectid, done) { actions.createProject(projectname, projectid, function (error) { diff --git a/spec/e2e/update.spec.js b/spec/e2e/update.spec.js index cd4e8bc2..8a08c20b 100644 --- a/spec/e2e/update.spec.js +++ b/spec/e2e/update.spec.js @@ -25,7 +25,7 @@ var actions = require('./helpers/projectActions.js'), platformEdge = { version: getCurrentVersion(), path: '.' }; var DOWNLOAD_TIMEOUT = 2 * 60 * 1000, - UPDATE_TIMEOUT = 60 * 1000, + UPDATE_TIMEOUT = 90 * 1000, PLATFORM_GIT_URL = 'https://github.com/apache/cordova-android'; function getCurrentVersion() {