Skip to content

Commit

Permalink
chore(deps): update dependency husky to v6 (#381)
Browse files Browse the repository at this point in the history
* chore(deps): update dependency husky to v6

* chore: add husky prepare

* chore: add is-ci

* Revert "chore: add is-ci"

This reverts commit 67fafd0.

* chore: add test -n CI

* chore: dress docker as a CI to skip postinstalls

* Update targets/frontend/Dockerfile

* update yarn lock

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: LionelB <=>
Co-authored-by: Douglas DUTEIL <douglasduteil@gmail.com>
Co-authored-by: Lionel <lionel.breduillieard@beta.gouv.fr>
  • Loading branch information
4 people committed Apr 6, 2021
1 parent 869a312 commit 9b0e36d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
5 changes: 3 additions & 2 deletions .husky/pre-push
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
. "$(dirname $0)/_/husky.sh"

yarn lerna run \
--parallel prepush \
--since origin/alpha \
--exclude-dependents \
--parallel pre-push\
--since master \
--stream \
;

Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"devDependencies": {
"@commitlint/cli": "^12.1.1",
"@commitlint/config-conventional": "^12.1.1",
"husky": "^5.2.0",
"husky": "^6.0.0",
"lerna": "^4.0.0",
"nps": "^5.10.0",
"nps-utils": "^1.7.0"
Expand All @@ -26,7 +26,8 @@
"lint": "nps lint",
"start": "nps",
"test": "nps test",
"k8s": "yarn --silent --cwd .k8s"
"k8s": "yarn --silent --cwd .k8s",
"prepare": "test -n \"$CI\" || husky install"
},
"workspaces": [
"shared/*",
Expand Down
2 changes: 2 additions & 0 deletions targets/frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ COPY shared/id-generator/package.json /app/shared/id-generator/

COPY targets/frontend/package.json /app/targets/frontend/

# NOTE(douglasduteil): disable most post install script by faking a CI
ENV CI=true
RUN npx @socialgouv/yarn-workspace-focus-install \
--cwd targets/frontend \
--production \
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7669,10 +7669,10 @@ humanize-ms@^1.2.1:
dependencies:
ms "^2.0.0"

husky@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/husky/-/husky-5.2.0.tgz#fc5e1c2300d34855d47de4753607d00943fc0802"
integrity sha512-AM8T/auHXRBxlrfPVLKP6jt49GCM2Zz47m8G3FOMsLmTv8Dj/fKVWE0Rh2d4Qrvmy131xEsdQnb3OXRib67PGg==
husky@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==

iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
version "0.4.24"
Expand Down

0 comments on commit 9b0e36d

Please sign in to comment.