From 6e180af3137b21635588e0993710e603e4cbdb8f Mon Sep 17 00:00:00 2001 From: Pedro Figueiredo Date: Tue, 9 May 2023 20:39:38 +0100 Subject: [PATCH] remove pre commit hook for branch names (#19077) * remove pre commit hook for branch names * bail with ticket number 0 detected --- .github/scripts/label-prs.ts | 4 +++ .husky/pre-push | 4 --- .validate-branch-namerc.js | 11 ------- package.json | 1 - yarn.lock | 57 ------------------------------------ 5 files changed, 4 insertions(+), 73 deletions(-) delete mode 100755 .husky/pre-push delete mode 100644 .validate-branch-namerc.js diff --git a/.github/scripts/label-prs.ts b/.github/scripts/label-prs.ts index ef4e790db..8d05779d7 100644 --- a/.github/scripts/label-prs.ts +++ b/.github/scripts/label-prs.ts @@ -26,6 +26,10 @@ async function main(): Promise { issueNumber = getIssueNumberFromBranchName(headRef); } + if (Number(issueNumber) === 0) { + process.exit(0); + } + await updateLabels(octokit, issueNumber); } diff --git a/.husky/pre-push b/.husky/pre-push deleted file mode 100755 index bbf5399ef..000000000 --- a/.husky/pre-push +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - -yarn validate-branch-name \ No newline at end of file diff --git a/.validate-branch-namerc.js b/.validate-branch-namerc.js deleted file mode 100644 index 8685701d1..000000000 --- a/.validate-branch-namerc.js +++ /dev/null @@ -1,11 +0,0 @@ -const BRANCH_REGEX = - /^(main|develop|(ci|chore|docs|feat|feature|fix|perf|refactor|revert|style)\/\d*(?:[-](?![-])\w*)*|Version-v\d+\.\d+\.\d+)$/; - -const ERROR_MSG = - 'This branch name does not follow our conventions.' + - '\n' + - 'Rename it with "git branch -m "' + - '\n' + - 'Here are some example branch names that are accepted: "fix/123-description", "feat/123-longer-description", "feature/123", "main", "develop", "Version-v10.24.2".'; - -module.exports = { pattern: BRANCH_REGEX, errorMsg: ERROR_MSG }; diff --git a/package.json b/package.json index e878e91a8..be2d0959c 100644 --- a/package.json +++ b/package.json @@ -366,7 +366,6 @@ "unicode-confusables": "^0.1.1", "uuid": "^8.3.2", "valid-url": "^1.0.9", - "validate-branch-name": "^1.3.0", "web3-stream-provider": "^4.0.0", "zxcvbn": "^4.4.2" }, diff --git a/yarn.lock b/yarn.lock index a60d76397..34e31bee6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10029,13 +10029,6 @@ __metadata: languageName: node linkType: hard -"babel-plugin-add-module-exports@npm:^0.2.1": - version: 0.2.1 - resolution: "babel-plugin-add-module-exports@npm:0.2.1" - checksum: 0d40e7b970161a10960fbbd0492565ae2f3f4872b4da089f8f5bb874cfac4e38e088e4d96bc33cef22a8963774abe84622feeebbbe049ad95c4ee33c907b277d - languageName: node - linkType: hard - "babel-plugin-add-react-displayname@npm:^0.0.5": version: 0.0.5 resolution: "babel-plugin-add-react-displayname@npm:0.0.5" @@ -13352,17 +13345,6 @@ __metadata: languageName: node linkType: hard -"current-git-branch@npm:^1.1.0": - version: 1.1.0 - resolution: "current-git-branch@npm:1.1.0" - dependencies: - babel-plugin-add-module-exports: ^0.2.1 - execa: ^0.6.1 - is-git-repository: ^1.0.0 - checksum: 57042d5c9fc608a951e81310da1caa3bdf917d0fede06996bfd7eaab5bdee7d29ced3440c3c73e5d90e503e689e2084e1906b1a17723e35684b1579d1bb5a54f - languageName: node - linkType: hard - "cwd@npm:^0.10.0": version: 0.10.0 resolution: "cwd@npm:0.10.0" @@ -16280,21 +16262,6 @@ __metadata: languageName: node linkType: hard -"execa@npm:^0.6.1": - version: 0.6.3 - resolution: "execa@npm:0.6.3" - dependencies: - cross-spawn: ^5.0.1 - get-stream: ^3.0.0 - is-stream: ^1.1.0 - npm-run-path: ^2.0.0 - p-finally: ^1.0.0 - signal-exit: ^3.0.0 - strip-eof: ^1.0.0 - checksum: 2c66177731273a7c0a4c031af81b486b67ec1eeeb8f353ebc68e0cfe7f63aca9ebc1e6fe03ba10f130f2bd179c0ac69b35668fe2bfc1ceb68fbf5291d0783457 - languageName: node - linkType: hard - "execa@npm:^0.7.0": version: 0.7.0 resolution: "execa@npm:0.7.0" @@ -20131,16 +20098,6 @@ __metadata: languageName: node linkType: hard -"is-git-repository@npm:^1.0.0": - version: 1.1.1 - resolution: "is-git-repository@npm:1.1.1" - dependencies: - execa: ^0.6.1 - path-is-absolute: ^1.0.1 - checksum: 2873d41da9ae5771a9118bdd743f32fa868301c57e8e4d8e255d4e14c04267112294a29f2824531fa554696042d8d87185811cff2de2a06381cff7d61d9ac22d - languageName: node - linkType: hard - "is-glob@npm:^2.0.0, is-glob@npm:^2.0.1": version: 2.0.1 resolution: "is-glob@npm:2.0.1" @@ -24372,7 +24329,6 @@ __metadata: unicode-confusables: ^0.1.1 uuid: ^8.3.2 valid-url: ^1.0.9 - validate-branch-name: ^1.3.0 vinyl: ^2.2.1 vinyl-buffer: ^1.0.1 vinyl-source-stream: ^2.0.0 @@ -34012,19 +33968,6 @@ __metadata: languageName: node linkType: hard -"validate-branch-name@npm:^1.3.0": - version: 1.3.0 - resolution: "validate-branch-name@npm:1.3.0" - dependencies: - commander: ^8.3.0 - cosmiconfig: ^7.0.1 - current-git-branch: ^1.1.0 - bin: - validate-branch-name: cli.js - checksum: be82c1e39bfe0519fa02f01670b5ef928903a19289249559c9148c0fd20df356f373f2490fbfd54d018868a6348cc2ceb82fb67d5f5c48c15ecb48735b9b87fb - languageName: node - linkType: hard - "validate-npm-package-license@npm:^3.0.1": version: 3.0.4 resolution: "validate-npm-package-license@npm:3.0.4"