Merge pull request #38 from codfish/pre-commit-validate

fix: only run validate pre-commit if script exists
codfish · Feb 17, 2020 · 7b40938 · 7b40938
2 parents 4cb3105 + 398138c
commit 7b40938
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v1
 
       - uses: actions/setup-node@v1
         with:

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -11,7 +11,7 @@ jobs:
         node: [10.x, 11.x, 12.x]
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v1
 
       - uses: actions/setup-node@v1
         with:

diff --git a/src/scripts/pre-commit.js b/src/scripts/pre-commit.js
@@ -1,6 +1,6 @@
 const path = require('path');
 const spawn = require('cross-spawn');
-const { hasPkgProp, hasFile, resolveBin } = require('../utils');
+const { hasPkgProp, hasFile, ifScript, resolveBin } = require('../utils');
 
 const here = p => path.join(__dirname, p);
 const hereRelative = p => here(p).replace(process.cwd(), '.');
@@ -19,7 +19,7 @@ const lintStagedResult = spawn.sync(resolveBin('lint-staged'), [...config, ...ar
   stdio: 'inherit',
 });
 
-if (lintStagedResult.status === 0) {
+if (lintStagedResult.status === 0 && ifScript('validate', true)) {
   const validateResult = spawn.sync('npm', ['run', 'validate'], {
     stdio: 'inherit',
   });