From cb5494d2fe6c5c531d5ceaf6b114ece57a102aae Mon Sep 17 00:00:00 2001 From: develar Date: Wed, 21 Dec 2016 19:40:43 +0100 Subject: [PATCH] test: use yarn on CircleCI --- appveyor.yml | 2 +- circle.yml | 2 +- nsis-auto-updater/package.json | 2 +- yarn.lock | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8c06a195bcb..2de3956d695 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ cache: - '%USERPROFILE%\.electron' environment: - TEST_FILES: BuildTest,extraMetadataTest,filesTest,globTest + TEST_FILES: BuildTest,extraMetadataTest,filesTest,globTest,nsisUpdaterTest,appxTest,winPackagerTest install: - ps: Install-Product node 6 x64 diff --git a/circle.yml b/circle.yml index 7b07ab37485..19a194abd55 100644 --- a/circle.yml +++ b/circle.yml @@ -14,7 +14,7 @@ dependencies: - sudo apt-get install git-lfs=1.3.0 - ssh git@github.com git-lfs-authenticate $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git download - git lfs pull - - docker run --rm --env-file ./test/docker-env.list -v ${PWD}:/project -v ~/.electron:/root/.electron -v ~/.cache/electron-builder:/root/.cache/electron-builder electronuserland/electron-builder:$([ "$CIRCLE_NODE_INDEX" == "2" ] && echo "4" || echo "wine") /test.sh + - docker run --rm --env-file ./test/docker-env.list -v ${PWD}:/project -v ~/.electron:/root/.electron -v ~/.cache/electron-builder:/root/.cache/electron-builder electronuserland/electron-builder:$([ "$CIRCLE_NODE_INDEX" == "2" ] && echo "4" || echo "wine") /bin/bash -c "node ./test/yarn.js && node ./test/yarn.js test" test: override: diff --git a/nsis-auto-updater/package.json b/nsis-auto-updater/package.json index f2e78726186..58fa22451d8 100644 --- a/nsis-auto-updater/package.json +++ b/nsis-auto-updater/package.json @@ -13,7 +13,7 @@ ], "dependencies": { "bluebird-lst-c": "^1.0.5", - "debug": "^2.4.5", + "debug": "^2.5.1", "fs-extra-p": "^3.0.3", "js-yaml": "^3.7.0", "semver": "^5.3.0", diff --git a/yarn.lock b/yarn.lock index baaa46e2dae..44127e92201 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2159,8 +2159,8 @@ jsonparse@^1.2.0: resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.2.0.tgz#5c0c5685107160e72fe7489bddea0b44c2bc67bd" jsonpointer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.0.tgz#6661e161d2fc445f19f98430231343722e1fcbd5" + version "4.0.1" + resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" jsprim@^1.2.2: version "1.3.1"