Merge dc3bdba into 979d54e

.github/workflows/lint.yml

@@ -1,5 +1,7 @@
 name: Lint
 on: [push, pull_request]
+env:
+  CI: true
 
 jobs:
   lint:
@@ -21,8 +23,6 @@ jobs:
 
       - name: Install npm dependencies
         run: npm ci
-        env:
-          CI: true
 
       - name: Run Lint
         run: npm run lint

.github/workflows/test-cdn.yml

@@ -1,5 +1,7 @@
 name: CDN Tests
 on: [push, pull_request]
+env:
+  CI: true
 
 jobs:
   functional-debug:
@@ -22,8 +24,6 @@ jobs:
 
       - name: Install npm dependencies
         run: npm ci
-        env:
-          CI: true
 
       - name: Run functional tests (debug)
         run: npm run mocha:only-functional:dev
@@ -48,8 +48,6 @@ jobs:
 
       - name: Install npm dependencies
         run: npm ci
-        env:
-          CI: true
 
       - name: Run functional tests (production)
         run: npm run mocha:only-functional:prod

.github/workflows/test.yml

@@ -1,5 +1,7 @@
 name: Tests
 on: [push, pull_request]
+env:
+  CI: true
 
 jobs:
   test:
@@ -21,15 +23,11 @@ jobs:
 
       - name: Install npm dependencies
         run: npm ci
-        env:
-          CI: true
 
       - name: Run tests with coverage
         run: npm run nyc -- npm run mocha:no-functional
 
       - name: Run Coveralls
-        run: npm run coveralls
-        if: github.repository == 'MaxCDN/bootstrapcdn' && github.event_name == 'push'
-        env:
-          COVERALLS_REPO_TOKEN: "${{ secrets.COVERALLS_REPO_TOKEN }}"
-          COVERALLS_GIT_BRANCH: "${{ github.ref }}"
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -4,7 +4,6 @@
 /config/*.bak
 Dockme.yml
 npm-debug.log
-/.cache/
 /.nyc_output/
 /coverage/
 /data/

package.json

@@ -9,8 +9,7 @@
   "scripts": {
     "clean": "rm -rf ./node_modules/",
     "nyc": "nyc",
-    "coveralls": "nyc report --reporter=text-lcov | coveralls",
-    "eslint": "eslint . --cache --cache-location .cache/.eslintcache",
+    "eslint": "eslint . --cache --cache-location node_modules/.cache/.eslintcache",
     "puglint": "pug-lint views/",
     "pug-lint": "npm run puglint",
     "lint": "npm-run-all --continue-on-error --parallel eslint puglint",
@@ -59,7 +58,6 @@
     "bootlint": "0.16.7",
     "bootstrap": "4.3.1",
     "bootswatch": "4.3.1",
-    "coveralls": "^3.0.6",
     "escape-string-regexp": "^2.0.0",
     "eslint": "^6.5.1",
     "fs-extra": "^8.1.0",
@@ -84,6 +82,7 @@
     ],
     "reporter": [
       "html",
+      "lcov",
       "text-summary"
     ]
   }