]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Lint before build & test, remove lint from test (#10462)
authorJacco van den Berg <jaccoberg2281@gmail.com>
Thu, 7 Jul 2022 11:15:54 +0000 (13:15 +0200)
committerGitHub <noreply@github.com>
Thu, 7 Jul 2022 11:15:54 +0000 (07:15 -0400)
* Lint before build & test, remove lint from test
* should reconize test now
* test skip build in test step
* readd build step

.github/workflows/ci.yml
package.json

index 4353d5e7ac1c6b71964582c233388751d13ffcb9..edd45c212f51185a2133be492eba7169b2966530 100644 (file)
@@ -56,6 +56,8 @@ jobs:
               - 'tsconfig.json'
       - name: Install
         run: npm ci
+      - name: Lint
+        run: npm run lint
       - name: Build
         run: npm run build
       - name: Test
@@ -66,13 +68,11 @@ jobs:
         run: |
           npm run build
           if [ "${{ runner.os }}" == "macOS" ]; then
-            npm test --browsers chrome,safari
+            npm run test-ci --browsers chrome,safari
           else
-            xvfb-run --auto-servernum npm test
+            xvfb-run --auto-servernum npm run test-ci
           fi
         shell: bash
-      - name: Lint
-        run: npm run lint
       - name: Package
         if: steps.changes.outputs.docs == 'true'
         run: |
index 167bafe6be1abba9c53664de0233ebf7c5b0699b..486c0213efbd853838894a264645879963d71a35 100644 (file)
@@ -46,7 +46,8 @@
         "lint-tsc": "tsc",
         "lint-types": "eslint \"types/**/*.ts\" && node -r esm types/tests/autogen.js && tsc -p types/tests/",
         "lint": "concurrently \"npm:lint-*\"",
-        "test": "npm run lint && cross-env NODE_ENV=test karma start --auto-watch --single-run --coverage --grep"
+        "test": "npm run lint && npm run test-ci",
+        "test-ci": "cross-env NODE_ENV=test karma start --auto-watch --single-run --coverage --grep"
     },
     "devDependencies": {
         "@kurkle/color": "^0.2.1",