From bf436e2ec43e86ce9e8019688f9fd4e6b023dfcc Mon Sep 17 00:00:00 2001 From: Emmanuel Chambon Date: Fri, 9 Apr 2021 12:19:35 +0200 Subject: [PATCH 1/2] build: skip husky on CI --- package.json | 3 ++- yarn.lock | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c5e36670f..c74b01597 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@babel/core": "^7.12.10", "@babel/plugin-transform-runtime": "^7.12.10", "@babel/preset-env": "^7.12.11", - "@babel/preset-react":"7.13.13", + "@babel/preset-react": "7.13.13", "@commitlint/cli": "^12.0.0", "@commitlint/config-conventional": "^12.0.0", "@rollup/plugin-babel": "^5.2.2", @@ -18,6 +18,7 @@ "cross-env": "^7.0.3", "eslint": "^7.18.0", "husky": "^6.0.0", + "is-ci": "^3.0.0", "jest": "^26.6.3", "jest-junit": "^12.0.0", "lerna": "4.0.0", diff --git a/yarn.lock b/yarn.lock index 7ec301e5c..52b96af43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3222,6 +3222,11 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== +ci-info@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.1.1.tgz#9a32fcefdf7bcdb6f0a7e1c0f8098ec57897b80a" + integrity sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ== + cjs-module-lexer@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f" @@ -5259,6 +5264,13 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" +is-ci@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz#c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994" + integrity sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ== + dependencies: + ci-info "^3.1.1" + is-core-module@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" From 8258c792be07a30bbc27c08ef71692b0897a3c4e Mon Sep 17 00:00:00 2001 From: Emmanuel Chambon Date: Fri, 9 Apr 2021 12:22:30 +0200 Subject: [PATCH 2/2] fix: update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c74b01597..23776b35a 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "test": "jest", "test:watch": "yarn run test --watch", "test:coverage": "yarn run test --coverage", - "prepare": "husky install" + "prepare": "is-ci || husky install" }, "commitlint": { "extends": [