Merge branch 'master' into endpoints_branch

nepalcodes · May 3, 2020 · c7ad693 · c7ad693
2 parents fbdef97 + 53d3c6f
commit c7ad693
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,6 +10,11 @@ jobs:
       - run: npm run bootstrap
       - name: Lint javscript code
         run: npm run lint
+      - name: Archive eslint report
+        uses: actions/upload-artifact@v1
+        with:
+          name: eslint-report
+          path: .test/eslint-report.html
   cypress-run:
     runs-on: ubuntu-16.04
     steps:

diff --git a/.gitignore b/.gitignore
@@ -125,4 +125,6 @@ sketch
 /cypress/videos
 .DS_Store
 
-!docker/*
+!docker/*
+
+.test/
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "test": "start-server-and-test start \"3000|8080\" cy:open",
     "test-run": "start-server-and-test start \"3000|8080\" cy:run",
     "bootstrap": "lerna clean -y && lerna bootstrap --hoist",
-    "lint": "npx eslint . --ext .js --ignore-pattern node_modules/ --ignore-pattern build/ --ignore-pattern cypress/"
+    "lint": "npx eslint . --ext .js --ignore-pattern node_modules/ --ignore-pattern build/ --ignore-pattern cypress/ -o .test/eslint-report.html -f html ",
+    "lint-fix": "npx eslint . --fix --ext .js --ignore-pattern node_modules/ --ignore-pattern build --ignore-pattern cypress/"
   },
   "repository": {
     "type": "git",