From e15f1dcd8e81808a52551cfaab7d74b18063776a Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Mon, 8 Mar 2021 08:06:59 +1300 Subject: [PATCH] ci: don't run git hooks when in ci --- package.json | 5 +++-- yarn.lock | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f8a8a22a6..c0294fa56 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "test": "jest", "tools:regenerate-docs": "ts-node -T tools/regenerate-docs", "typecheck": "tsc -p .", - "postinstall": "husky install", + "postinstall": "is-ci || husky install", "prepublishOnly": "pinst --disable", "postpublish": "pinst --enable" }, @@ -78,7 +78,8 @@ ] }, "dependencies": { - "@typescript-eslint/experimental-utils": "^4.0.1" + "@typescript-eslint/experimental-utils": "^4.0.1", + "is-ci": "^3.0.0" }, "devDependencies": { "@babel/cli": "^7.4.4", diff --git a/yarn.lock b/yarn.lock index 4bb86878c..55661a8ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3282,6 +3282,13 @@ __metadata: languageName: node linkType: hard +"ci-info@npm:^3.1.1": + version: 3.1.1 + resolution: "ci-info@npm:3.1.1" + checksum: 417d2bf17c320d477bc32997d3831bcc1b174d6b48616c2f0463765f042f073bfbfb15e06abdeea55b05ca9c8e054057eb9e0672e4e6031457e87216b2faddda + languageName: node + linkType: hard + "cidr-regex@npm:^2.0.10": version: 2.0.10 resolution: "cidr-regex@npm:2.0.10" @@ -4574,6 +4581,7 @@ __metadata: eslint-plugin-node: ^11.0.0 eslint-plugin-prettier: ^3.0.0 husky: ^5.1.3 + is-ci: ^3.0.0 jest: ^26.0.1 jest-runner-eslint: ^0.10.0 lint-staged: ^10.2.2 @@ -6105,6 +6113,17 @@ __metadata: languageName: node linkType: hard +"is-ci@npm:^3.0.0": + version: 3.0.0 + resolution: "is-ci@npm:3.0.0" + dependencies: + ci-info: ^3.1.1 + bin: + is-ci: bin.js + checksum: 1e26d3ba6634ebee83f9d22f260354c5d950eada4d609c30cc2642069f8ba52f3aeb4c9bbf8099aaf04a2f44a1ed7beef2a24485f988753c8c078a57e9b3a2fd + languageName: node + linkType: hard + "is-cidr@npm:^3.0.0": version: 3.1.1 resolution: "is-cidr@npm:3.1.1"