From c0468cd8bad7542b3327e2fd2dd58fb2731f713b Mon Sep 17 00:00:00 2001 From: develar Date: Thu, 28 Jul 2016 21:42:56 +0200 Subject: [PATCH] test: attempt to fix travis issues --- .travis.yml | 9 ++++++--- test/src/helpers/runTests.ts | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a83cc4a73e..7f6af34ed6b 100755 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,13 @@ osx_image: xcode7.3 matrix: include: - os: osx - env: TEST_FILES=macPackagerTest,BuildTest,linuxPackagerTest,globTest NODE_VERSION=6 + env: TEST_FILES=BuildTest,linuxPackagerTest,globTest NODE_VERSION=6 PUBLISH_TO_NPM=true - os: osx - env: TEST_FILES=macPackagerTest,CodeSignTest,winPackagerTest NODE_VERSION=4 + env: TEST_FILES=macPackagerTest,winPackagerTest NODE_VERSION=6 + + - os: osx + env: TEST_FILES=macPackagerTest,CodeSignTest NODE_VERSION=4 language: c @@ -35,7 +38,7 @@ script: - npm run test after_success: -- if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" && "$AUTO_PUBLISH" != "false" && "$TRAVIS_TAG" == "" && "$NODE_VERSION" == "6" ]]; then npm run semantic-release ; fi +- if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" && "$AUTO_PUBLISH" != "false" && "$TRAVIS_TAG" == "" && "$PUBLISH_TO_NPM" == "true" ]]; then npm run semantic-release ; fi branches: except: diff --git a/test/src/helpers/runTests.ts b/test/src/helpers/runTests.ts index e3dbc73144b..8bb2bde8437 100755 --- a/test/src/helpers/runTests.ts +++ b/test/src/helpers/runTests.ts @@ -125,6 +125,10 @@ function runTests(): BluebirdPromise { const args: Array = [] const testFiles = process.env.TEST_FILES + if (process.env.TRAVIS) { + args.push("--concurrency=2") + } + const baseDir = path.join("test", "out") const baseForLinuxTests = [path.join(baseDir, "ArtifactPublisherTest.js"), path.join(baseDir, "httpRequestTest.js"), path.join(baseDir, "RepoSlugTest.js")] let skipWin = false