From cde39949798e78acae18ba2c619ee1d1fe14380e Mon Sep 17 00:00:00 2001
From: Even Stensberg <evenstensberg@gmail.com>
Date: Sat, 21 Jul 2018 01:00:13 +0200
Subject: [PATCH] [CI] Update circleCI to v2 (#1942)

* initial v2 config

t # This is a combination of 10 commits.

fix indent errs

fix indentations

run prepare manually

run prepare manually

remove indent

remove indent

remove indent

remove indent

remove indent

Misc

fix npm prepare

Install gulp

use gulp locally

use checkout

use old job

use old job

build-<test

build-<test

change

change

change

change

change

* add gulp as devdep

* local npm commands

* use node8

* cache bower components

* use npm to run checkstyle

* remove circlev1 config

* store artifacts

* clean up naming

fixes #1933
---
 .circleci/config.yml | 40 ++++++++++++++++++++++++++++++++++++++++
 circle.yml           | 27 ---------------------------
 package.json         |  2 ++
 3 files changed, 42 insertions(+), 27 deletions(-)
 create mode 100644 .circleci/config.yml
 delete mode 100644 circle.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..b6d8b741f6
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,40 @@
+version: 2
+jobs:
+  build:
+    docker:
+        - image: circleci/node:8-browsers
+          environment:
+            CHROME_BIN: "/usr/bin/google-chrome"
+    steps:
+        - checkout
+        - run:
+            name: Update npm
+            command: 'sudo npm install -g npm@latest'
+        - restore_cache:
+            key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "bower.json" }}
+        - run:
+            name: Installing dependencies (npm install)
+            command: npm install
+        - save_cache:
+            key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "bower.json" }}
+            paths:
+              - node_modules
+              - bower_components
+        - run:
+            name: npm run test
+            command: npm run test
+        - run:
+            name: npm run lint
+            command: npm run lint
+        - run:
+            name: npm run checkstyle
+            command: npm run checkstyle
+        - store_artifacts:
+            path: dist
+            prefix: dist
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - build
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 40941c75ad..0000000000
--- a/circle.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-machine:
-  node:
-    version: 8.11.0
-
-dependencies:
-  pre:
-    - npm install -g npm@latest
-
-deployment:
-  production:
-    branch: master
-    commands:
-        - npm install canvas nomnoml
-        - ./build-docs.sh
-  openmctweb-staging-deux:
-    branch: mobile
-    heroku:
-      appname: openmctweb-staging-deux
-test:
-  post:
-    - gulp lint
-    - gulp checkstyle
-
-general:
-  branches:
-    ignore:
-      - gh-pages
diff --git a/package.json b/package.json
index d6256351d8..121e0879b8 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,8 @@
     "start": "node app.js",
     "test": "karma start --single-run",
     "jshint": "jshint platform example",
+    "lint": "./node_modules/gulp/bin/gulp.js lint",
+    "checkstyle": "./node_modules/gulp/bin/gulp.js checkstyle",
     "watch": "karma start",
     "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
     "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",