Combine npm related workflows

github · May 8, 2020 · d966ea2 · d966ea2
1 parent 6bab450
commit d966ea2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 26 deletions.
diff --git a/.github/workflows/js-uptodate-check.yml → .github/workflows/lint-build-test.yml b/.github/workflows/js-uptodate-check.yml → .github/workflows/lint-build-test.yml
@@ -1,8 +1,16 @@
-name: "Check generated JavaScript"
+name: "Lint, Build & Test"
 
-on: [pull_request]
+on: [push]
 
 jobs:
+  tslint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: tslint
+      run: npm run-script lint
+
   check-js:
     runs-on: ubuntu-latest
 
@@ -25,3 +33,11 @@ jobs:
           exit 1
         fi
         echo "Success: JavaScript files are up to date"
+
+  npm-test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: npm run-script test
+      run: npm run-script test
diff --git a/.github/workflows/npm-test.yml b/.github/workflows/npm-test.yml
diff --git a/.github/workflows/ts-lint.yml b/.github/workflows/ts-lint.yml