Skip to content

Commit

Permalink
ci: Fix husky post-merge (#491)
Browse files Browse the repository at this point in the history
  • Loading branch information
peaceiris committed Feb 10, 2021
1 parent 9564982 commit 029d5ce
Show file tree
Hide file tree
Showing 3 changed files with 193 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .husky/post-merge
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
(git diff 'HEAD@{1}' --name-only | grep 'package-lock.json' > /dev/null) && npm ci || :
npm run update-deps
git remote prune origin
221 changes: 189 additions & 32 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"tsc": "tsc",
"format": "prettier --write **/*.ts",
"format:check": "prettier --check **/*.ts",
"release": "standard-version"
"release": "standard-version",
"update-deps": "(git diff 'HEAD@{1}' --name-only | grep 'package-lock.json' > /dev/null) && npm ci || :"
},
"lint-staged": {
"{src,__tests__}/**/*.ts": [
Expand Down Expand Up @@ -61,7 +62,7 @@
"@vercel/ncc": "^0.25.1",
"eslint": "^7.13.0",
"eslint-plugin-jest": "^24.1.2",
"husky": "^4.3.0",
"husky": "^4.3.8",
"jest": "^26.6.3",
"jest-circus": "^26.6.3",
"lint-staged": "^10.5.1",
Expand Down

0 comments on commit 029d5ce

Please sign in to comment.