From 4d5c3728323031e07f9cdd124190170989a38728 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Tue, 23 Jan 2018 14:43:41 -0400 Subject: [PATCH] chore: revise Concourse CI related npm scripts (#1977) - The `concourse-dependencies` and `concourse-build-installers` scripts are not necessary anymore, given that the Electron pipeline already knows how to perform these tasks - The `concourse-test` script will be renamed to `concourse-test-electron` to include the pipeline name (electron), so a single project can be served by more than one pipeline. I'll keep the old `concourse-test` for a bit for backwards compatibility until all Etcher PRs are rebased - There is a new `concourse-test-node-cli` script that will be used by the Node.js CLI pipeline - There is a new `test-cli` target that is supposed to host CLI tests. For now, it just runs the SDK tests in a Node.js environment (instead of in Electron) Change-Type: patch Signed-off-by: Juan Cruz Viotti --- Makefile | 6 ++++++ package.json | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e465c6bf..dcc319f4 100644 --- a/Makefile +++ b/Makefile @@ -371,6 +371,7 @@ TARGETS = \ test-spectron \ test-gui \ test-sdk \ + test-cli \ test \ sanity-checks \ clean \ @@ -549,6 +550,11 @@ test-sdk: tests/shared \ tests/image-stream +test-cli: + mocha $(MOCHA_OPTIONS) \ + tests/shared \ + tests/image-stream + test: test-gui test-sdk test-spectron help: diff --git a/package.json b/package.json index 3e22b5ea..6ca91c28 100644 --- a/package.json +++ b/package.json @@ -24,9 +24,9 @@ "configure": "node-gyp configure", "build": "node-gyp build", "install": "node-gyp rebuild", - "concourse-dependencies": "make info && make electron-develop", "concourse-test": "npm test", - "concourse-build-installers": "make installers-all" + "concourse-test-electron": "npm test", + "concourse-test-node-cli": "make lint test-cli sanity-checks" }, "author": "Resin Inc. ", "license": "Apache-2.0",