From 5a0879b980227a7e56e4ba3adbe87e681c435829 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Wed, 8 Sep 2021 04:54:38 +0000 Subject: [PATCH 01/41] added script to check git version --- .vscode/settings.json | 28 +++++++++++++++++++++++++++- tools/check_compatibility.mjs | 17 +++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 tools/check_compatibility.mjs diff --git a/.vscode/settings.json b/.vscode/settings.json index c192127b1fc5f6..9d03c6a6c33bbf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,5 +14,31 @@ }, "omnisharp.autoStart": false, "jest.autoRun": "off", - "jest.jestCommandLine": "yarn jest" + "jest.jestCommandLine": "yarn jest", + "workbench.colorCustomizations": { + "activityBar.activeBackground": "#ffffff", + "activityBar.activeBorder": "#df9f9f", + "activityBar.background": "#ffffff", + "activityBar.foreground": "#15202b", + "activityBar.inactiveForeground": "#15202b99", + "activityBarBadge.background": "#df9f9f", + "activityBarBadge.foreground": "#15202b", + "editorGroup.border": "#ffffff", + "panel.border": "#ffffff", + "sideBar.border": "#ffffff", + "statusBar.background": "#ffffff", + "statusBar.border": "#ffffff", + "statusBar.debuggingBackground": "#ffffff", + "statusBar.debuggingBorder": "#ffffff", + "statusBar.debuggingForeground": "#15202b", + "statusBar.foreground": "#15202b", + "statusBarItem.hoverBackground": "#e6e6e6", + "tab.activeBorder": "#ffffff", + "titleBar.activeBackground": "#eeeeee", + "titleBar.activeForeground": "#15202b", + "titleBar.border": "#eeeeee", + "titleBar.inactiveBackground": "#eeeeee99", + "titleBar.inactiveForeground": "#15202b99" + }, + "peacock.color": "#3a96ba" } diff --git a/tools/check_compatibility.mjs b/tools/check_compatibility.mjs new file mode 100644 index 00000000000000..39f5c7b230a99b --- /dev/null +++ b/tools/check_compatibility.mjs @@ -0,0 +1,17 @@ +import shell from 'shelljs'; + +function doSomething() { + let obj = shell.exec('get-git-version', { silent: true }).stdout.toString(); + obj = obj.split('{')[1].split(',')[1].split(':')[1].split('-'); + const verSion = obj[0].split('"')[1].slice(1).split('.'); + if ( + parseInt(verSion[0], 10) >= 2 && + parseInt(verSion[1], 10) >= 22 && + parseInt(verSion[2], 10) >= 0 + ) { + shell.echo('OK'); + } else { + shell.echo('NOT OK'); + } +} +doSomething(); From 5c2e25827f91d3c21c760eac7de6bbb8b4172b30 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Wed, 8 Sep 2021 15:07:45 +0000 Subject: [PATCH 02/41] test script --- .github/workflows/build.yml | 1 + package.json | 3 ++- tools/check_compatibility.js | 25 +++++++++++++++++++++++++ tools/check_compatibility.mjs | 17 ----------------- 4 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 tools/check_compatibility.js delete mode 100644 tools/check_compatibility.mjs diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 56e1549952fbc5..383fef5df4b5bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,7 @@ on: branches: - main - v25 + - feat/check-git-version workflow_dispatch: inputs: diff --git a/package.json b/package.json index 69f8c4dea8e5f0..44eb5b1f5f1087 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,11 @@ "eslint-fix": "eslint --ext .js,.mjs,.ts --fix lib/ test/ tools/", "generate": "run-s generate:*", "generate:imports": "node tools/generate-imports.mjs", + "git-check":"node tools/check_compatibility.js", "jest": "cross-env NODE_ENV=test LOG_LEVEL=fatal node --expose-gc node_modules/jest/bin/jest.js --logHeapUsage", "jest-debug": "cross-env NODE_OPTIONS=--inspect-brk yarn jest", "jest-silent": "cross-env yarn jest --reporters jest-silent-reporter", - "lint": "run-s ls-lint eslint prettier markdown-lint", + "lint": "run-s ls-lint eslint prettier markdown-lint git-check", "lint-fix": "run-s eslint-fix prettier-fix markdown-lint-fix", "ls-lint": "ls-lint", "markdown-lint": "markdownlint-cli2", diff --git a/tools/check_compatibility.js b/tools/check_compatibility.js new file mode 100644 index 00000000000000..3363dca76eb191 --- /dev/null +++ b/tools/check_compatibility.js @@ -0,0 +1,25 @@ +const shell = require('shelljs'); + +function checkGitVersion() { + try { + const gitVersion = shell + .exec('git --version', { silent: true }) + .stdout.toString() + .slice(12) + .split('.'); + if ( + parseInt(gitVersion[0], 10) >= 2 && + parseInt(gitVersion[1], 10) >= 22 && + parseInt(gitVersion[2], 10) >= 0 + ) { + shell.echo('VERSION OK'); + } else { + // shell.echo('WARNING: GIT VERSION NOT COMAPTIBLE'); + throw new Error('GIT VERSION NOT COMAPTIBLE'); + } + } catch (err) { + shell.echo('ERROR:', err.message); + process.exit(1); + } +} +checkGitVersion(); diff --git a/tools/check_compatibility.mjs b/tools/check_compatibility.mjs deleted file mode 100644 index 39f5c7b230a99b..00000000000000 --- a/tools/check_compatibility.mjs +++ /dev/null @@ -1,17 +0,0 @@ -import shell from 'shelljs'; - -function doSomething() { - let obj = shell.exec('get-git-version', { silent: true }).stdout.toString(); - obj = obj.split('{')[1].split(',')[1].split(':')[1].split('-'); - const verSion = obj[0].split('"')[1].slice(1).split('.'); - if ( - parseInt(verSion[0], 10) >= 2 && - parseInt(verSion[1], 10) >= 22 && - parseInt(verSion[2], 10) >= 0 - ) { - shell.echo('OK'); - } else { - shell.echo('NOT OK'); - } -} -doSomething(); From 4f121180ecfe1c3327a4d5c964fb8f5c44191082 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Thu, 9 Sep 2021 09:03:39 +0000 Subject: [PATCH 03/41] changed formatting --- .ls-lint.yml | 1 + package.json | 3 +-- tools/check_compatibility.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ls-lint.yml b/.ls-lint.yml index cd58b92629c1ff..f2cf318f78f2f6 100644 --- a/.ls-lint.yml +++ b/.ls-lint.yml @@ -17,3 +17,4 @@ ignore: - node_modules - SECURITY.md - test/e2e/node_modules + - tools/check_compatibility.js diff --git a/package.json b/package.json index 44eb5b1f5f1087..69f8c4dea8e5f0 100644 --- a/package.json +++ b/package.json @@ -19,11 +19,10 @@ "eslint-fix": "eslint --ext .js,.mjs,.ts --fix lib/ test/ tools/", "generate": "run-s generate:*", "generate:imports": "node tools/generate-imports.mjs", - "git-check":"node tools/check_compatibility.js", "jest": "cross-env NODE_ENV=test LOG_LEVEL=fatal node --expose-gc node_modules/jest/bin/jest.js --logHeapUsage", "jest-debug": "cross-env NODE_OPTIONS=--inspect-brk yarn jest", "jest-silent": "cross-env yarn jest --reporters jest-silent-reporter", - "lint": "run-s ls-lint eslint prettier markdown-lint git-check", + "lint": "run-s ls-lint eslint prettier markdown-lint", "lint-fix": "run-s eslint-fix prettier-fix markdown-lint-fix", "ls-lint": "ls-lint", "markdown-lint": "markdownlint-cli2", diff --git a/tools/check_compatibility.js b/tools/check_compatibility.js index 3363dca76eb191..18e8510d8dce26 100644 --- a/tools/check_compatibility.js +++ b/tools/check_compatibility.js @@ -12,7 +12,7 @@ function checkGitVersion() { parseInt(gitVersion[1], 10) >= 22 && parseInt(gitVersion[2], 10) >= 0 ) { - shell.echo('VERSION OK'); + process.exit(0); } else { // shell.echo('WARNING: GIT VERSION NOT COMAPTIBLE'); throw new Error('GIT VERSION NOT COMAPTIBLE'); From 75cf396a06832d3700c0fb9bff7952f8f36de144 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Thu, 9 Sep 2021 09:12:26 +0000 Subject: [PATCH 04/41] chaanged script for git check --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 69f8c4dea8e5f0..44eb5b1f5f1087 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,11 @@ "eslint-fix": "eslint --ext .js,.mjs,.ts --fix lib/ test/ tools/", "generate": "run-s generate:*", "generate:imports": "node tools/generate-imports.mjs", + "git-check":"node tools/check_compatibility.js", "jest": "cross-env NODE_ENV=test LOG_LEVEL=fatal node --expose-gc node_modules/jest/bin/jest.js --logHeapUsage", "jest-debug": "cross-env NODE_OPTIONS=--inspect-brk yarn jest", "jest-silent": "cross-env yarn jest --reporters jest-silent-reporter", - "lint": "run-s ls-lint eslint prettier markdown-lint", + "lint": "run-s ls-lint eslint prettier markdown-lint git-check", "lint-fix": "run-s eslint-fix prettier-fix markdown-lint-fix", "ls-lint": "ls-lint", "markdown-lint": "markdownlint-cli2", From 37feea2223012246a67d58b268be4916c0373ed7 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Fri, 10 Sep 2021 16:14:53 +0000 Subject: [PATCH 05/41] emitted script ignore --- .ls-lint.yml | 2 +- tools/check_compatibility.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ls-lint.yml b/.ls-lint.yml index f2cf318f78f2f6..8c33884facb391 100644 --- a/.ls-lint.yml +++ b/.ls-lint.yml @@ -17,4 +17,4 @@ ignore: - node_modules - SECURITY.md - test/e2e/node_modules - - tools/check_compatibility.js + # - tools/check_compatibility.js diff --git a/tools/check_compatibility.js b/tools/check_compatibility.js index 18e8510d8dce26..51b0f8ee0f8c15 100644 --- a/tools/check_compatibility.js +++ b/tools/check_compatibility.js @@ -1,16 +1,16 @@ const shell = require('shelljs'); -function checkGitVersion() { +function checkgitversion() { try { - const gitVersion = shell + const gitversion = shell .exec('git --version', { silent: true }) .stdout.toString() .slice(12) .split('.'); if ( - parseInt(gitVersion[0], 10) >= 2 && - parseInt(gitVersion[1], 10) >= 22 && - parseInt(gitVersion[2], 10) >= 0 + parseInt(gitversion[0], 10) >= 2 && + parseInt(gitversion[1], 10) >= 22 && + parseInt(gitversion[2], 10) >= 0 ) { process.exit(0); } else { @@ -22,4 +22,4 @@ function checkGitVersion() { process.exit(1); } } -checkGitVersion(); +checkgitversion(); From c5b254e962e09a0955cfd1bb24919df453d6aa57 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Fri, 10 Sep 2021 16:56:35 +0000 Subject: [PATCH 06/41] changed filename to follow kebabcase --- .ls-lint.yml | 1 - package.json | 2 +- .../{check_compatibility.js => check-git-version.js} | 12 ++++++------ 3 files changed, 7 insertions(+), 8 deletions(-) rename tools/{check_compatibility.js => check-git-version.js} (66%) diff --git a/.ls-lint.yml b/.ls-lint.yml index 8c33884facb391..cd58b92629c1ff 100644 --- a/.ls-lint.yml +++ b/.ls-lint.yml @@ -17,4 +17,3 @@ ignore: - node_modules - SECURITY.md - test/e2e/node_modules - # - tools/check_compatibility.js diff --git a/package.json b/package.json index 44eb5b1f5f1087..043470e429860c 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "eslint-fix": "eslint --ext .js,.mjs,.ts --fix lib/ test/ tools/", "generate": "run-s generate:*", "generate:imports": "node tools/generate-imports.mjs", - "git-check":"node tools/check_compatibility.js", + "git-check":"node tools/check-git-version.js", "jest": "cross-env NODE_ENV=test LOG_LEVEL=fatal node --expose-gc node_modules/jest/bin/jest.js --logHeapUsage", "jest-debug": "cross-env NODE_OPTIONS=--inspect-brk yarn jest", "jest-silent": "cross-env yarn jest --reporters jest-silent-reporter", diff --git a/tools/check_compatibility.js b/tools/check-git-version.js similarity index 66% rename from tools/check_compatibility.js rename to tools/check-git-version.js index 51b0f8ee0f8c15..18e8510d8dce26 100644 --- a/tools/check_compatibility.js +++ b/tools/check-git-version.js @@ -1,16 +1,16 @@ const shell = require('shelljs'); -function checkgitversion() { +function checkGitVersion() { try { - const gitversion = shell + const gitVersion = shell .exec('git --version', { silent: true }) .stdout.toString() .slice(12) .split('.'); if ( - parseInt(gitversion[0], 10) >= 2 && - parseInt(gitversion[1], 10) >= 22 && - parseInt(gitversion[2], 10) >= 0 + parseInt(gitVersion[0], 10) >= 2 && + parseInt(gitVersion[1], 10) >= 22 && + parseInt(gitVersion[2], 10) >= 0 ) { process.exit(0); } else { @@ -22,4 +22,4 @@ function checkgitversion() { process.exit(1); } } -checkgitversion(); +checkGitVersion(); From bb085f7cfd97deebcee384af64c90261f32a79c8 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Sat, 11 Sep 2021 21:40:07 +0545 Subject: [PATCH 07/41] Update tools/check-git-version.js Co-authored-by: Rhys Arkins --- tools/check-git-version.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index 18e8510d8dce26..97bcb5972da6fc 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -14,8 +14,7 @@ function checkGitVersion() { ) { process.exit(0); } else { - // shell.echo('WARNING: GIT VERSION NOT COMAPTIBLE'); - throw new Error('GIT VERSION NOT COMAPTIBLE'); + throw new Error('Minimum git version 2.33.0 is required'); } } catch (err) { shell.echo('ERROR:', err.message); From d3836edbd6a7e6ae2dbebad253d5d89761923ef5 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Sun, 12 Sep 2021 21:12:32 +0545 Subject: [PATCH 08/41] Added regex to comapre git version --- tools/check-git-version.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index 97bcb5972da6fc..8e5e75f4f57dc1 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -2,11 +2,11 @@ const shell = require('shelljs'); function checkGitVersion() { try { - const gitVersion = shell + const regex = /[\d]+(?=.)/g; + const gitVersion = shell .exec('git --version', { silent: true }) - .stdout.toString() - .slice(12) - .split('.'); + .stdout.toString(); + if ( parseInt(gitVersion[0], 10) >= 2 && parseInt(gitVersion[1], 10) >= 22 && From c1452308325836f2f60c70beb75584ea0abeacbf Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Sun, 12 Sep 2021 21:13:07 +0545 Subject: [PATCH 09/41] changed code logic --- tools/check-git-version.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index 8e5e75f4f57dc1..d0e437798aeb5f 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -7,12 +7,20 @@ function checkGitVersion() { .exec('git --version', { silent: true }) .stdout.toString(); - if ( - parseInt(gitVersion[0], 10) >= 2 && - parseInt(gitVersion[1], 10) >= 22 && - parseInt(gitVersion[2], 10) >= 0 - ) { - process.exit(0); + const [major, minor, revision] = gitVersion.match(regex); + const [reqMajor, reqMinor, reqRevision] = GIT_MINIMUM_VERSION.match(regex); + if (major < reqMajor) { + throw new Error('Minimum git version 2.33.0 is required'); + } else if (major === reqMajor) { + if (minor < reqMinor) { + throw new Error('Minimum git version 2.33.0 is required'); + } else if (minor === reqMinor) { + if (revision < reqRevision) { + throw new Error('Minimum git version 2.33.0 is required'); + } + } + } + process.exit(0); } else { throw new Error('Minimum git version 2.33.0 is required'); } From 8ca4e171b48a8002e0aeeeae8c74b05dd49cbdb1 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Sun, 12 Sep 2021 21:13:39 +0545 Subject: [PATCH 10/41] removed .vscode directory --- .vscode/extensions.json | 7 ---- .vscode/launch.json | 80 ----------------------------------------- .vscode/settings.json | 44 ----------------------- 3 files changed, 131 deletions(-) delete mode 100644 .vscode/extensions.json delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/settings.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 7f14713aa345b1..00000000000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "recommendations": [ - "EditorConfig.editorconfig", - "esbenp.prettier-vscode", - "dbaeumer.vscode-eslint" - ] -} diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index cedef1459c4c08..00000000000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "type": "node", - "request": "launch", - "name": "debug", - "program": "${workspaceFolder}/lib/renovate.ts", - "env": { - "LOG_LEVEL": "debug" - }, - "console": "integratedTerminal", - "runtimeArgs": ["-r", "ts-node/register/transpile-only"], - "protocol": "inspector", - "skipFiles": ["/**/*.js"] - }, - { - "type": "node", - "request": "launch", - "name": "Jest Current File", - "program": "${workspaceFolder}/node_modules/.bin/jest", - "args": [ - "--runInBand", - "--collectCoverage=false", - "--testTimeout 100000000", - "--runTestsByPath", - "${relativeFile}" - ], - "env": { - "NODE_ENV": "test", - "LOG_LEVEL": "debug" - }, - "console": "integratedTerminal", - "windows": { - "program": "${workspaceFolder}/node_modules/jest/bin/jest" - }, - "runtimeArgs": ["--preserve-symlinks"], - "protocol": "inspector", - "skipFiles": ["/**/*.js"] - }, - { - "type": "node", - "request": "launch", - "name": "Jest All", - "program": "${workspaceFolder}/node_modules/.bin/jest", - "args": [ - "--runInBand", - "--collectCoverage=false", - "--testTimeout 100000000" - ], - "env": { - "NODE_ENV": "test", - "LOG_LEVEL": "debug" - }, - "console": "integratedTerminal", - "windows": { - "program": "${workspaceFolder}/node_modules/jest/bin/jest" - }, - "runtimeArgs": ["--preserve-symlinks"], - "protocol": "inspector", - "skipFiles": ["/**/*.js"] - }, - { - "type": "node", - "name": "vscode-jest-tests", - "request": "launch", - "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen", - "disableOptimisticBPs": true, - "cwd": "${workspaceFolder}", - "runtimeExecutable": "yarn", - "args": [ - "jest", - "--runInBand", - "--watchAll=false", - "--testTimeout 100000000" - ] - } - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 9d03c6a6c33bbf..00000000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "files.associations": { - "Dockerfile.*": "dockerfile", - ".releaserc": "json" - }, - "omnisharp.autoStart": false, - "jest.autoRun": "off", - "jest.jestCommandLine": "yarn jest", - "workbench.colorCustomizations": { - "activityBar.activeBackground": "#ffffff", - "activityBar.activeBorder": "#df9f9f", - "activityBar.background": "#ffffff", - "activityBar.foreground": "#15202b", - "activityBar.inactiveForeground": "#15202b99", - "activityBarBadge.background": "#df9f9f", - "activityBarBadge.foreground": "#15202b", - "editorGroup.border": "#ffffff", - "panel.border": "#ffffff", - "sideBar.border": "#ffffff", - "statusBar.background": "#ffffff", - "statusBar.border": "#ffffff", - "statusBar.debuggingBackground": "#ffffff", - "statusBar.debuggingBorder": "#ffffff", - "statusBar.debuggingForeground": "#15202b", - "statusBar.foreground": "#15202b", - "statusBarItem.hoverBackground": "#e6e6e6", - "tab.activeBorder": "#ffffff", - "titleBar.activeBackground": "#eeeeee", - "titleBar.activeForeground": "#15202b", - "titleBar.border": "#eeeeee", - "titleBar.inactiveBackground": "#eeeeee99", - "titleBar.inactiveForeground": "#15202b99" - }, - "peacock.color": "#3a96ba" -} From 8e0666fae56a6fa1029cb22e8e2d6685a3136dcc Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Sun, 12 Sep 2021 21:15:03 +0545 Subject: [PATCH 11/41] removed workflow trigger --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 383fef5df4b5bc..5d403e5e2a82f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: branches: - main - v25 - - feat/check-git-version + workflow_dispatch: inputs: From 2dc2854dd93ad2f3519f822259ef360ac6e8b236 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Sun, 12 Sep 2021 21:19:05 +0545 Subject: [PATCH 12/41] changed code logic --- tools/check-git-version.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index d0e437798aeb5f..f4e958a09a8f77 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -1,5 +1,6 @@ const shell = require('shelljs'); +const GIT_MINIMUM_VERSION = '2.33.0'; function checkGitVersion() { try { const regex = /[\d]+(?=.)/g; @@ -21,9 +22,6 @@ function checkGitVersion() { } } process.exit(0); - } else { - throw new Error('Minimum git version 2.33.0 is required'); - } } catch (err) { shell.echo('ERROR:', err.message); process.exit(1); From 3e1554d73d7d6d59e63230915405b024c53ce4b8 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Sun, 12 Sep 2021 21:21:22 +0545 Subject: [PATCH 13/41] changed code logic --- tools/check-git-version.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index f4e958a09a8f77..ab194adb430cc6 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -3,21 +3,23 @@ const shell = require('shelljs'); const GIT_MINIMUM_VERSION = '2.33.0'; function checkGitVersion() { try { - const regex = /[\d]+(?=.)/g; - const gitVersion = shell + const regex = /[\d]+(?=.)/g; + const gitVersion = shell .exec('git --version', { silent: true }) .stdout.toString(); - - const [major, minor, revision] = gitVersion.match(regex); + const GIT_VERSION_NOT_COMPATIBLE_ERROR = new Error( + 'Minimum git version 2.33.0 is required' + ); + const [major, minor, revision] = gitVersion.match(regex); const [reqMajor, reqMinor, reqRevision] = GIT_MINIMUM_VERSION.match(regex); if (major < reqMajor) { - throw new Error('Minimum git version 2.33.0 is required'); + throw GIT_VERSION_NOT_COMPATIBLE_ERROR; } else if (major === reqMajor) { if (minor < reqMinor) { - throw new Error('Minimum git version 2.33.0 is required'); + throw GIT_VERSION_NOT_COMPATIBLE_ERROR; } else if (minor === reqMinor) { if (revision < reqRevision) { - throw new Error('Minimum git version 2.33.0 is required'); + throw GIT_VERSION_NOT_COMPATIBLE_ERROR; } } } From 3c61bba4a21cc6adaf50011fec8f108f9389025b Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Mon, 13 Sep 2021 07:13:05 +0000 Subject: [PATCH 14/41] changed code logic --- package.json | 2 +- tools/check-git-version.js | 23 ++++++----------------- tsconfig.json | 2 +- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 043470e429860c..9065f333dc78b3 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "eslint-fix": "eslint --ext .js,.mjs,.ts --fix lib/ test/ tools/", "generate": "run-s generate:*", "generate:imports": "node tools/generate-imports.mjs", - "git-check":"node tools/check-git-version.js", + "git-check": "node tools/check-git-version.js", "jest": "cross-env NODE_ENV=test LOG_LEVEL=fatal node --expose-gc node_modules/jest/bin/jest.js --logHeapUsage", "jest-debug": "cross-env NODE_OPTIONS=--inspect-brk yarn jest", "jest-silent": "cross-env yarn jest --reporters jest-silent-reporter", diff --git a/tools/check-git-version.js b/tools/check-git-version.js index ab194adb430cc6..a55e7664b9f22b 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -1,27 +1,16 @@ +const semver = require('semver'); const shell = require('shelljs'); const GIT_MINIMUM_VERSION = '2.33.0'; function checkGitVersion() { try { - const regex = /[\d]+(?=.)/g; - const gitVersion = shell + const regex = /[\d.]+(?=)/g; + let gitVersion = shell .exec('git --version', { silent: true }) .stdout.toString(); - const GIT_VERSION_NOT_COMPATIBLE_ERROR = new Error( - 'Minimum git version 2.33.0 is required' - ); - const [major, minor, revision] = gitVersion.match(regex); - const [reqMajor, reqMinor, reqRevision] = GIT_MINIMUM_VERSION.match(regex); - if (major < reqMajor) { - throw GIT_VERSION_NOT_COMPATIBLE_ERROR; - } else if (major === reqMajor) { - if (minor < reqMinor) { - throw GIT_VERSION_NOT_COMPATIBLE_ERROR; - } else if (minor === reqMinor) { - if (revision < reqRevision) { - throw GIT_VERSION_NOT_COMPATIBLE_ERROR; - } - } + gitVersion = gitVersion.match(regex)[0]; + if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { + throw new Error('Minimum git version 2.33.0 is required'); } process.exit(0); } catch (err) { diff --git a/tsconfig.json b/tsconfig.json index 409aaf9567f698..6be1651bed2615 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,7 @@ "experimentalDecorators": true, "useUnknownInCatchVariables": false /* we aren't prepared for enabling this by default since ts 4.4*/, "lib": ["es2018"], - "types": ["node", "jest", "jest-extended"], + "types": ["jest", "jest-extended", "node"], "allowJs": true, "checkJs": true }, From db215604a32646c0e7298fb3b64eac3e4fb8db54 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Mon, 13 Sep 2021 07:38:46 +0000 Subject: [PATCH 15/41] added minimum git version variable --- tools/check-git-version.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index a55e7664b9f22b..cab03ce795bf80 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -10,7 +10,9 @@ function checkGitVersion() { .stdout.toString(); gitVersion = gitVersion.match(regex)[0]; if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { - throw new Error('Minimum git version 2.33.0 is required'); + throw new Error( + 'Minimum git version ' + GIT_MINIMUM_VERSION + ' is required' + ); } process.exit(0); } catch (err) { From a858472ba4ffa480d1540ecca6642e72f526f789 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Mon, 13 Sep 2021 13:59:30 +0545 Subject: [PATCH 16/41] Update tools/check-git-version.js Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> --- tools/check-git-version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index cab03ce795bf80..fcef14255f83b8 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -11,7 +11,7 @@ function checkGitVersion() { gitVersion = gitVersion.match(regex)[0]; if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { throw new Error( - 'Minimum git version ' + GIT_MINIMUM_VERSION + ' is required' + 'Minimum Git version ' + GIT_MINIMUM_VERSION + ' is required' ); } process.exit(0); From 636c68d908748ee14a3a1de12a284067354aa83e Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Mon, 13 Sep 2021 13:59:42 +0545 Subject: [PATCH 17/41] Update .github/workflows/build.yml Co-authored-by: Michael Kriese --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d403e5e2a82f9..56e1549952fbc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,6 @@ on: branches: - main - v25 - workflow_dispatch: inputs: From 4076d8c22de28e9835e2959d8f3e6d297dc9f302 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Mon, 13 Sep 2021 14:01:32 +0545 Subject: [PATCH 18/41] Update tools/check-git-version.js Co-authored-by: Michael Kriese --- tools/check-git-version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index fcef14255f83b8..c14e400848df36 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -4,7 +4,7 @@ const shell = require('shelljs'); const GIT_MINIMUM_VERSION = '2.33.0'; function checkGitVersion() { try { - const regex = /[\d.]+(?=)/g; + const regex = /\d+\.\d+\.\d+/; let gitVersion = shell .exec('git --version', { silent: true }) .stdout.toString(); From e865a3b4fbbf429a043a6a9bcc5da7c07ae300be Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Mon, 13 Sep 2021 14:01:50 +0545 Subject: [PATCH 19/41] Update tools/check-git-version.js Co-authored-by: Michael Kriese --- tools/check-git-version.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index c14e400848df36..a0399971a58cb4 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -5,10 +5,8 @@ const GIT_MINIMUM_VERSION = '2.33.0'; function checkGitVersion() { try { const regex = /\d+\.\d+\.\d+/; - let gitVersion = shell - .exec('git --version', { silent: true }) - .stdout.toString(); - gitVersion = gitVersion.match(regex)[0]; + const { stdout } = shell.exec('git --version', { silent: true }); + const [ gitVersion ] = regex.exec(stdout); if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { throw new Error( 'Minimum Git version ' + GIT_MINIMUM_VERSION + ' is required' From 43fb3c97ccc6cbf7e56d9d207a5ee895376281ee Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Mon, 13 Sep 2021 08:25:00 +0000 Subject: [PATCH 20/41] reverted unwanted changes --- package.json | 3 ++- tools/check-git-version.js | 32 +++++++++++++++----------------- tsconfig.json | 2 +- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 9065f333dc78b3..d23fceec780260 100644 --- a/package.json +++ b/package.json @@ -280,5 +280,6 @@ }, "files": [ "dist" - ] + ], + "type":"module" } diff --git a/tools/check-git-version.js b/tools/check-git-version.js index a0399971a58cb4..07bd7aab17b73b 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -1,21 +1,19 @@ -const semver = require('semver'); -const shell = require('shelljs'); +import semver from 'semver'; +import shell from 'shelljs'; const GIT_MINIMUM_VERSION = '2.33.0'; -function checkGitVersion() { - try { - const regex = /\d+\.\d+\.\d+/; - const { stdout } = shell.exec('git --version', { silent: true }); - const [ gitVersion ] = regex.exec(stdout); - if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { - throw new Error( - 'Minimum Git version ' + GIT_MINIMUM_VERSION + ' is required' - ); - } - process.exit(0); - } catch (err) { - shell.echo('ERROR:', err.message); - process.exit(1); + +try { + const regex = /\d+\.\d+\.\d+/; + const { stdout } = shell.exec('git --version', { silent: true }); + const [gitVersion] = regex.exec(stdout); + if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { + throw new Error( + 'Minimum Git version ' + GIT_MINIMUM_VERSION + ' is required' + ); } + process.exit(0); +} catch (err) { + shell.echo('ERROR:', err.message); + process.exit(1); } -checkGitVersion(); diff --git a/tsconfig.json b/tsconfig.json index 6be1651bed2615..409aaf9567f698 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,7 @@ "experimentalDecorators": true, "useUnknownInCatchVariables": false /* we aren't prepared for enabling this by default since ts 4.4*/, "lib": ["es2018"], - "types": ["jest", "jest-extended", "node"], + "types": ["node", "jest", "jest-extended"], "allowJs": true, "checkJs": true }, From b20051c490ee43aad787858c2ed4f9a05cb60da0 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Mon, 13 Sep 2021 20:22:18 +0545 Subject: [PATCH 21/41] using js template in error message string --- tools/check-git-version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index 07bd7aab17b73b..53ff6ff74ddc56 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -9,7 +9,7 @@ try { const [gitVersion] = regex.exec(stdout); if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { throw new Error( - 'Minimum Git version ' + GIT_MINIMUM_VERSION + ' is required' + `Minimum git version ${GIT_MINIMUM_VERSION} is required` ); } process.exit(0); From a41f104e5c48d8ede7c5c4c9ffa0efd244beafe9 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Mon, 13 Sep 2021 15:47:27 +0000 Subject: [PATCH 22/41] added deleted files and using simple-git --- .vscode/extensions.json | 7 ++++ .vscode/launch.json | 80 ++++++++++++++++++++++++++++++++++++++ .vscode/settings.json | 18 +++++++++ tools/check-git-version.js | 28 ++++++------- 4 files changed, 120 insertions(+), 13 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 00000000000000..7f14713aa345b1 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + "recommendations": [ + "EditorConfig.editorconfig", + "esbenp.prettier-vscode", + "dbaeumer.vscode-eslint" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000000000..cedef1459c4c08 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,80 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "debug", + "program": "${workspaceFolder}/lib/renovate.ts", + "env": { + "LOG_LEVEL": "debug" + }, + "console": "integratedTerminal", + "runtimeArgs": ["-r", "ts-node/register/transpile-only"], + "protocol": "inspector", + "skipFiles": ["/**/*.js"] + }, + { + "type": "node", + "request": "launch", + "name": "Jest Current File", + "program": "${workspaceFolder}/node_modules/.bin/jest", + "args": [ + "--runInBand", + "--collectCoverage=false", + "--testTimeout 100000000", + "--runTestsByPath", + "${relativeFile}" + ], + "env": { + "NODE_ENV": "test", + "LOG_LEVEL": "debug" + }, + "console": "integratedTerminal", + "windows": { + "program": "${workspaceFolder}/node_modules/jest/bin/jest" + }, + "runtimeArgs": ["--preserve-symlinks"], + "protocol": "inspector", + "skipFiles": ["/**/*.js"] + }, + { + "type": "node", + "request": "launch", + "name": "Jest All", + "program": "${workspaceFolder}/node_modules/.bin/jest", + "args": [ + "--runInBand", + "--collectCoverage=false", + "--testTimeout 100000000" + ], + "env": { + "NODE_ENV": "test", + "LOG_LEVEL": "debug" + }, + "console": "integratedTerminal", + "windows": { + "program": "${workspaceFolder}/node_modules/jest/bin/jest" + }, + "runtimeArgs": ["--preserve-symlinks"], + "protocol": "inspector", + "skipFiles": ["/**/*.js"] + }, + { + "type": "node", + "name": "vscode-jest-tests", + "request": "launch", + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen", + "disableOptimisticBPs": true, + "cwd": "${workspaceFolder}", + "runtimeExecutable": "yarn", + "args": [ + "jest", + "--runInBand", + "--watchAll=false", + "--testTimeout 100000000" + ] + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000000..c192127b1fc5f6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,18 @@ +{ + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[json]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "files.associations": { + "Dockerfile.*": "dockerfile", + ".releaserc": "json" + }, + "omnisharp.autoStart": false, + "jest.autoRun": "off", + "jest.jestCommandLine": "yarn jest" +} diff --git a/tools/check-git-version.js b/tools/check-git-version.js index 53ff6ff74ddc56..90a9607540f433 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -1,19 +1,21 @@ import semver from 'semver'; import shell from 'shelljs'; +import simpleGit from 'simple-git'; const GIT_MINIMUM_VERSION = '2.33.0'; - -try { - const regex = /\d+\.\d+\.\d+/; - const { stdout } = shell.exec('git --version', { silent: true }); - const [gitVersion] = regex.exec(stdout); - if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { - throw new Error( - `Minimum git version ${GIT_MINIMUM_VERSION} is required` - ); +const git = simpleGit(); +async function checkGitVersion() { + try { + const regex = /\d+\.\d+\.\d+/; + const stdout = await git.raw('--version'); + const [gitVersion] = regex.exec(stdout); + if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { + throw new Error(`Minimum git version ${GIT_MINIMUM_VERSION} is required`); + } + process.exit(0); + } catch (err) { + shell.echo('ERROR:', err.message); + process.exit(1); } - process.exit(0); -} catch (err) { - shell.echo('ERROR:', err.message); - process.exit(1); } +checkGitVersion(); From d5f54df2c8aac2c14a6039c3d4c7ebda136d735c Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Tue, 14 Sep 2021 17:47:00 +0200 Subject: [PATCH 23/41] Update tools/check-git-version.js Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> --- tools/check-git-version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index 90a9607540f433..6f848dbce050aa 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -10,7 +10,7 @@ async function checkGitVersion() { const stdout = await git.raw('--version'); const [gitVersion] = regex.exec(stdout); if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { - throw new Error(`Minimum git version ${GIT_MINIMUM_VERSION} is required`); + throw new Error(`Minimum Git version ${GIT_MINIMUM_VERSION} is required`); } process.exit(0); } catch (err) { From 165f616c6c2c55cb2543d78bac90efcf8aa350e3 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Wed, 15 Sep 2021 01:13:55 +0545 Subject: [PATCH 24/41] Update tools/check-git-version.js Co-authored-by: Rhys Arkins --- tools/check-git-version.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index 6f848dbce050aa..adab401370ed1b 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -18,4 +18,6 @@ async function checkGitVersion() { process.exit(1); } } -checkGitVersion(); +(async () => { + checkGitVersion(); +})(); From ae0d9fd64462605569a1db7dea98ec1e5eb85a5e Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Wed, 15 Sep 2021 01:14:26 +0545 Subject: [PATCH 25/41] Update tools/check-git-version.js Co-authored-by: Michael Kriese --- tools/check-git-version.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/check-git-version.js b/tools/check-git-version.js index adab401370ed1b..fe1713d6bd292f 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.js @@ -4,7 +4,8 @@ import simpleGit from 'simple-git'; const GIT_MINIMUM_VERSION = '2.33.0'; const git = simpleGit(); -async function checkGitVersion() { +// eslint-disable-next-line @typescript-eslint/no-floating-promises +(async () => { try { const regex = /\d+\.\d+\.\d+/; const stdout = await git.raw('--version'); From c6d9299aec95ea5e4fcdce2f9abdc28948352337 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Tue, 14 Sep 2021 19:42:35 +0000 Subject: [PATCH 26/41] changed file from js->mjs --- .vscode/settings.json | 28 ++++++++++++++++++- ...k-git-version.js => check-git-version.mjs} | 3 -- 2 files changed, 27 insertions(+), 4 deletions(-) rename tools/{check-git-version.js => check-git-version.mjs} (94%) diff --git a/.vscode/settings.json b/.vscode/settings.json index c192127b1fc5f6..7fae4a6cd40fd3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,5 +14,31 @@ }, "omnisharp.autoStart": false, "jest.autoRun": "off", - "jest.jestCommandLine": "yarn jest" + "jest.jestCommandLine": "yarn jest", + "workbench.colorCustomizations": { + "activityBar.activeBackground": "#ffffff", + "activityBar.activeBorder": "#df9f9f", + "activityBar.background": "#ffffff", + "activityBar.foreground": "#15202b", + "activityBar.inactiveForeground": "#15202b99", + "activityBarBadge.background": "#df9f9f", + "activityBarBadge.foreground": "#15202b", + "editorGroup.border": "#ffffff", + "panel.border": "#ffffff", + "sideBar.border": "#ffffff", + "statusBar.background": "#ffffff", + "statusBar.border": "#ffffff", + "statusBar.debuggingBackground": "#ffffff", + "statusBar.debuggingBorder": "#ffffff", + "statusBar.debuggingForeground": "#15202b", + "statusBar.foreground": "#15202b", + "statusBarItem.hoverBackground": "#e6e6e6", + "tab.activeBorder": "#ffffff", + "titleBar.activeBackground": "#eeeeee", + "titleBar.activeForeground": "#15202b", + "titleBar.border": "#eeeeee", + "titleBar.inactiveBackground": "#eeeeee99", + "titleBar.inactiveForeground": "#15202b99" + }, + "peacock.color": "#be9cab" } diff --git a/tools/check-git-version.js b/tools/check-git-version.mjs similarity index 94% rename from tools/check-git-version.js rename to tools/check-git-version.mjs index fe1713d6bd292f..1081226336ffb9 100644 --- a/tools/check-git-version.js +++ b/tools/check-git-version.mjs @@ -18,7 +18,4 @@ const git = simpleGit(); shell.echo('ERROR:', err.message); process.exit(1); } -} -(async () => { - checkGitVersion(); })(); From 13bd65b56c729fefb40fb646cdc49d8652caac4a Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Tue, 14 Sep 2021 19:43:49 +0000 Subject: [PATCH 27/41] removed type:module --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index d23fceec780260..9065f333dc78b3 100644 --- a/package.json +++ b/package.json @@ -280,6 +280,5 @@ }, "files": [ "dist" - ], - "type":"module" + ] } From 974524481a140c820658ca375f389d304a418fa6 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Tue, 14 Sep 2021 19:45:09 +0000 Subject: [PATCH 28/41] removed unwanted changes --- .vscode/settings.json | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 7fae4a6cd40fd3..c192127b1fc5f6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,31 +14,5 @@ }, "omnisharp.autoStart": false, "jest.autoRun": "off", - "jest.jestCommandLine": "yarn jest", - "workbench.colorCustomizations": { - "activityBar.activeBackground": "#ffffff", - "activityBar.activeBorder": "#df9f9f", - "activityBar.background": "#ffffff", - "activityBar.foreground": "#15202b", - "activityBar.inactiveForeground": "#15202b99", - "activityBarBadge.background": "#df9f9f", - "activityBarBadge.foreground": "#15202b", - "editorGroup.border": "#ffffff", - "panel.border": "#ffffff", - "sideBar.border": "#ffffff", - "statusBar.background": "#ffffff", - "statusBar.border": "#ffffff", - "statusBar.debuggingBackground": "#ffffff", - "statusBar.debuggingBorder": "#ffffff", - "statusBar.debuggingForeground": "#15202b", - "statusBar.foreground": "#15202b", - "statusBarItem.hoverBackground": "#e6e6e6", - "tab.activeBorder": "#ffffff", - "titleBar.activeBackground": "#eeeeee", - "titleBar.activeForeground": "#15202b", - "titleBar.border": "#eeeeee", - "titleBar.inactiveBackground": "#eeeeee99", - "titleBar.inactiveForeground": "#15202b99" - }, - "peacock.color": "#be9cab" + "jest.jestCommandLine": "yarn jest" } From 05e2c82e372803f943eefe6ec1b17480b4a46be0 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Wed, 15 Sep 2021 17:38:04 +0545 Subject: [PATCH 29/41] Update package.json Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9065f333dc78b3..70ba39e9828a90 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "eslint-fix": "eslint --ext .js,.mjs,.ts --fix lib/ test/ tools/", "generate": "run-s generate:*", "generate:imports": "node tools/generate-imports.mjs", - "git-check": "node tools/check-git-version.js", + "git-check": "node tools/check-git-version.mjs", "jest": "cross-env NODE_ENV=test LOG_LEVEL=fatal node --expose-gc node_modules/jest/bin/jest.js --logHeapUsage", "jest-debug": "cross-env NODE_OPTIONS=--inspect-brk yarn jest", "jest-silent": "cross-env yarn jest --reporters jest-silent-reporter", From fc7a92aa575494548a200811c4fb08ee01fae41a Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Wed, 15 Sep 2021 14:01:37 +0200 Subject: [PATCH 30/41] Try mac/windows testing --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 303eb15be19c6a..fdea9b65854be2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,7 @@ on: branches: - main - v25 + - feat/check-git-version # remove before merging workflow_dispatch: inputs: From 8f1745b634af36a6bf3f2ffae61a58a1bca8c5fd Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Wed, 15 Sep 2021 14:13:26 +0200 Subject: [PATCH 31/41] Update build.yml --- .github/workflows/build.yml | 138 +----------------------------------- 1 file changed, 2 insertions(+), 136 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fdea9b65854be2..79ad1a614ac9e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,84 +21,6 @@ env: DRY_RUN: true jobs: - test: - runs-on: ${{ matrix.os }} - - # tests shouldn't need more time - timeout-minutes: 30 - - strategy: - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - node-version: [14] - python-version: [3.9] - java-version: [11] - - env: - coverage: ${{ matrix.os == 'ubuntu-latest' && matrix.node-version == 14 }} - NODE_VERSION: ${{ matrix.node-version }} - PYTHON_VERSION: ${{ matrix.python-version }} - JAVA_VERSION: ${{ matrix.java-version }} - - steps: - - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # renovate: tag=v2.3.4 - with: - fetch-depth: 2 - - - name: Set up Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@25316bbc1f10ac9d8798711f44914b1cf3c4e954 # renovate: tag=v2.4.0 - with: - node-version: ${{ env.NODE_VERSION }} - cache: yarn - - - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@dc73133d4da04e56a135ae2246682783cc7c7cb6 # renovate: tag=v2.2.2 - with: - python-version: ${{ env.PYTHON_VERSION }} - - - name: Set up Java ${{ env.JAVA_VERSION }} - if: env.NODE_VERSION == '14' - uses: actions/setup-java@3bc31aaf88e8fc94dc1e632d48af61be5ca8721c # renovate: tag=v2.3.0 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: 'adopt' - java-package: jre - check-latest: false - - - name: Skip Java tests - if: env.NODE_VERSION != '14' - run: echo "SKIP_JAVA_TESTS=true" >> $GITHUB_ENV - - - name: Init platform - shell: bash - run: | - git config --global core.autocrlf false - git config --global core.symlinks true - git config --global user.email 'renovate@whitesourcesoftware.com' - git config --global user.name 'Renovate Bot' - npm config set scripts-prepend-node-path true - echo "Node $(node --version)" - python --version - echo "Yarn $(yarn --version)" - - - name: Installing dependencies - run: yarn install --frozen-lockfile - - - name: Unit tests - run: yarn jest --maxWorkers=2 --ci --coverage ${{ env.coverage }} - - - name: Codecov - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # renovate: tag=v2.1.0 - if: always() && env.coverage == 'true' - - # build after tests to exclude build files from tests - # TODO: check if build before test speeds up tests - - name: Build - run: yarn build - - - name: E2E Test - run: yarn test-e2e - lint: runs-on: ubuntu-latest @@ -131,62 +53,6 @@ jobs: - name: Lint run: | - yarn ls-lint - yarn eslint -f gha - yarn prettier - yarn markdown-lint - - - name: Test schema - run: yarn test-schema - - - name: Type check - run: yarn type-check - - release: - needs: [lint, test] - runs-on: ubuntu-latest - # release shouldn't need more than 5 min - timeout-minutes: 15 + yarn git-check - steps: - # full checkout for semantic-release - - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # renovate: tag=v2.3.4 - with: - fetch-depth: 0 - - - name: Set up Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@25316bbc1f10ac9d8798711f44914b1cf3c4e954 # renovate: tag=v2.4.0 - with: - node-version: ${{ env.NODE_VERSION }} - cache: yarn - - - name: Init platform - run: | - git config --global core.autocrlf false - git config --global core.symlinks true - git config --global user.email 'renovate@whitesourcesoftware.com' - git config --global user.name 'Renovate Bot' - yarn config set version-git-tag false - npm config set scripts-prepend-node-path true - - - name: Check dry run - run: | - if [[ "${{github.event_name}}" == "workflow_dispatch" && "${{ github.event.inputs.dryRun }}" != "true" ]]; then - echo "DRY_RUN=false" >> $GITHUB_ENV - elif [[ "${{github.ref}}" == "refs/heads/${{env.DEFAULT_BRANCH}}" ]]; then - echo "DRY_RUN=false" >> $GITHUB_ENV - elif [[ "${{github.ref}}" =~ ^refs/heads/v[0-9]+(\.[0-9]+)?$ ]]; then - echo "DRY_RUN=false" >> $GITHUB_ENV - fi - - - name: Installing dependencies - run: yarn install --frozen-lockfile - - - name: semantic-release - run: | - echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' >> ./.npmrc - npx semantic-release --dry-run ${{env.DRY_RUN}} - git checkout -- .npmrc - env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + From 69531fec9f09cb7ba44b1fb73eaba765f1510f0b Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Wed, 15 Sep 2021 14:14:41 +0200 Subject: [PATCH 32/41] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79ad1a614ac9e3..85e2f7ac671e63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ env: jobs: lint: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} # lint shouldn't need more than 10 min timeout-minutes: 15 From e9f559f98ffff416d1942246f4ba1cd154949434 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Wed, 15 Sep 2021 14:18:24 +0200 Subject: [PATCH 33/41] Update build.yml --- .github/workflows/build.yml | 46 ++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85e2f7ac671e63..fcc8e777bb3ce6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,11 +21,24 @@ env: DRY_RUN: true jobs: - lint: + test: runs-on: ${{ matrix.os }} - # lint shouldn't need more than 10 min - timeout-minutes: 15 + # tests shouldn't need more time + timeout-minutes: 30 + + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + node-version: [14] + python-version: [3.9] + java-version: [11] + + env: + coverage: ${{ matrix.os == 'ubuntu-latest' && matrix.node-version == 14 }} + NODE_VERSION: ${{ matrix.node-version }} + PYTHON_VERSION: ${{ matrix.python-version }} + JAVA_VERSION: ${{ matrix.java-version }} steps: - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # renovate: tag=v2.3.4 @@ -38,7 +51,26 @@ jobs: node-version: ${{ env.NODE_VERSION }} cache: yarn + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@dc73133d4da04e56a135ae2246682783cc7c7cb6 # renovate: tag=v2.2.2 + with: + python-version: ${{ env.PYTHON_VERSION }} + + - name: Set up Java ${{ env.JAVA_VERSION }} + if: env.NODE_VERSION == '14' + uses: actions/setup-java@3bc31aaf88e8fc94dc1e632d48af61be5ca8721c # renovate: tag=v2.3.0 + with: + java-version: ${{ env.JAVA_VERSION }} + distribution: 'adopt' + java-package: jre + check-latest: false + + - name: Skip Java tests + if: env.NODE_VERSION != '14' + run: echo "SKIP_JAVA_TESTS=true" >> $GITHUB_ENV + - name: Init platform + shell: bash run: | git config --global core.autocrlf false git config --global core.symlinks true @@ -46,13 +78,11 @@ jobs: git config --global user.name 'Renovate Bot' npm config set scripts-prepend-node-path true echo "Node $(node --version)" + python --version echo "Yarn $(yarn --version)" - name: Installing dependencies run: yarn install --frozen-lockfile - - name: Lint - run: | - yarn git-check - - + - name: Git check + run: yarn git-check From b64570c597196620402ef2a88e1dbdf38aa45507 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Wed, 15 Sep 2021 14:23:51 +0200 Subject: [PATCH 34/41] Update check-git-version.mjs --- tools/check-git-version.mjs | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/check-git-version.mjs b/tools/check-git-version.mjs index 1081226336ffb9..98d8b618e0e248 100644 --- a/tools/check-git-version.mjs +++ b/tools/check-git-version.mjs @@ -13,6 +13,7 @@ const git = simpleGit(); if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { throw new Error(`Minimum Git version ${GIT_MINIMUM_VERSION} is required`); } + console.log('Found git version: ' + gitVersion); process.exit(0); } catch (err) { shell.echo('ERROR:', err.message); From 2a68923a5b86e2e606e92b131db8af3d45bfcd82 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Wed, 15 Sep 2021 14:26:42 +0200 Subject: [PATCH 35/41] Update build.yml --- .github/workflows/build.yml | 110 +++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fcc8e777bb3ce6..e04f05b571da25 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,6 @@ on: branches: - main - v25 - - feat/check-git-version # remove before merging workflow_dispatch: inputs: @@ -84,5 +83,110 @@ jobs: - name: Installing dependencies run: yarn install --frozen-lockfile - - name: Git check - run: yarn git-check + - name: Unit tests + run: yarn jest --maxWorkers=2 --ci --coverage ${{ env.coverage }} + + - name: Codecov + uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # renovate: tag=v2.1.0 + if: always() && env.coverage == 'true' + + # build after tests to exclude build files from tests + # TODO: check if build before test speeds up tests + - name: Build + run: yarn build + + - name: E2E Test + run: yarn test-e2e + + lint: + runs-on: ubuntu-latest + + # lint shouldn't need more than 10 min + timeout-minutes: 15 + + steps: + - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # renovate: tag=v2.3.4 + with: + fetch-depth: 2 + + - name: Set up Node.js ${{ env.NODE_VERSION }} + uses: actions/setup-node@25316bbc1f10ac9d8798711f44914b1cf3c4e954 # renovate: tag=v2.4.0 + with: + node-version: ${{ env.NODE_VERSION }} + cache: yarn + + - name: Init platform + run: | + git config --global core.autocrlf false + git config --global core.symlinks true + git config --global user.email 'renovate@whitesourcesoftware.com' + git config --global user.name 'Renovate Bot' + npm config set scripts-prepend-node-path true + echo "Node $(node --version)" + echo "Yarn $(yarn --version)" + + - name: Installing dependencies + run: yarn install --frozen-lockfile + + - name: Lint + run: | + yarn ls-lint + yarn eslint -f gha + yarn prettier + yarn markdown-lint + yarn git-check + + - name: Test schema + run: yarn test-schema + + - name: Type check + run: yarn type-check + + release: + needs: [lint, test] + runs-on: ubuntu-latest + # release shouldn't need more than 5 min + timeout-minutes: 15 + + steps: + # full checkout for semantic-release + - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # renovate: tag=v2.3.4 + with: + fetch-depth: 0 + + - name: Set up Node.js ${{ env.NODE_VERSION }} + uses: actions/setup-node@25316bbc1f10ac9d8798711f44914b1cf3c4e954 # renovate: tag=v2.4.0 + with: + node-version: ${{ env.NODE_VERSION }} + cache: yarn + + - name: Init platform + run: | + git config --global core.autocrlf false + git config --global core.symlinks true + git config --global user.email 'renovate@whitesourcesoftware.com' + git config --global user.name 'Renovate Bot' + yarn config set version-git-tag false + npm config set scripts-prepend-node-path true + + - name: Check dry run + run: | + if [[ "${{github.event_name}}" == "workflow_dispatch" && "${{ github.event.inputs.dryRun }}" != "true" ]]; then + echo "DRY_RUN=false" >> $GITHUB_ENV + elif [[ "${{github.ref}}" == "refs/heads/${{env.DEFAULT_BRANCH}}" ]]; then + echo "DRY_RUN=false" >> $GITHUB_ENV + elif [[ "${{github.ref}}" =~ ^refs/heads/v[0-9]+(\.[0-9]+)?$ ]]; then + echo "DRY_RUN=false" >> $GITHUB_ENV + fi + + - name: Installing dependencies + run: yarn install --frozen-lockfile + + - name: semantic-release + run: | + echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' >> ./.npmrc + npx semantic-release --dry-run ${{env.DRY_RUN}} + git checkout -- .npmrc + env: + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} From 1d22ea7964ef33dcd738fdd6ad672e69942485d3 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Wed, 15 Sep 2021 14:27:26 +0200 Subject: [PATCH 36/41] Update build-pr.yml --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 299350a8755aac..9a04fff85afb11 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -13,7 +13,6 @@ concurrency: cancel-in-progress: true jobs: - test: runs-on: ubuntu-latest # tests shouldn't need more time @@ -100,6 +99,7 @@ jobs: yarn eslint -f gha yarn prettier yarn markdown-lint + yarn git-check - name: Test schema run: yarn test-schema From 1fb0306cea50aaa8d0d42bb737e0358b9a2a5d29 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Wed, 15 Sep 2021 14:28:35 +0200 Subject: [PATCH 37/41] Update build-pr.yml --- .github/workflows/build-pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 9a04fff85afb11..09798362d1ceee 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -13,6 +13,7 @@ concurrency: cancel-in-progress: true jobs: + test: runs-on: ubuntu-latest # tests shouldn't need more time From ed2601f8d628f0731a6b81d80dabcbc825344f41 Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Wed, 15 Sep 2021 18:24:08 +0545 Subject: [PATCH 38/41] Update tools/check-git-version.mjs Co-authored-by: Michael Kriese --- tools/check-git-version.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/check-git-version.mjs b/tools/check-git-version.mjs index 98d8b618e0e248..40741fa7f51dff 100644 --- a/tools/check-git-version.mjs +++ b/tools/check-git-version.mjs @@ -13,7 +13,7 @@ const git = simpleGit(); if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { throw new Error(`Minimum Git version ${GIT_MINIMUM_VERSION} is required`); } - console.log('Found git version: ' + gitVersion); + shell.echo('Found git version: ', gitVersion); process.exit(0); } catch (err) { shell.echo('ERROR:', err.message); From 77ebe9bc2c438d1da1341f1d36ea810873b2221b Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Wed, 15 Sep 2021 19:01:14 +0545 Subject: [PATCH 39/41] Update tools/check-git-version.mjs Co-authored-by: Michael Kriese --- tools/check-git-version.mjs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/check-git-version.mjs b/tools/check-git-version.mjs index 40741fa7f51dff..f2ba0b6e104fd5 100644 --- a/tools/check-git-version.mjs +++ b/tools/check-git-version.mjs @@ -11,7 +11,11 @@ const git = simpleGit(); const stdout = await git.raw('--version'); const [gitVersion] = regex.exec(stdout); if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { - throw new Error(`Minimum Git version ${GIT_MINIMUM_VERSION} is required`); + if (process.env.CI) { + shell.echo(`::error ::Minimum Git version ${GIT_MINIMUM_VERSION} is required`); + } else { + throw new Error(`Minimum Git version ${GIT_MINIMUM_VERSION} is required`); + } } shell.echo('Found git version: ', gitVersion); process.exit(0); From 0e71e51c04d537f3e82cb6d0674d03a9c504b5ea Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Wed, 15 Sep 2021 14:28:36 +0000 Subject: [PATCH 40/41] prettier formatting --- .vscode/settings.json | 28 +++++++++++++++++++++++++++- tools/check-git-version.mjs | 8 ++++++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index c192127b1fc5f6..f861c5e6bd196f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,5 +14,31 @@ }, "omnisharp.autoStart": false, "jest.autoRun": "off", - "jest.jestCommandLine": "yarn jest" + "jest.jestCommandLine": "yarn jest", + "workbench.colorCustomizations": { + "activityBar.activeBackground": "#ffffff", + "activityBar.activeBorder": "#df9f9f", + "activityBar.background": "#ffffff", + "activityBar.foreground": "#15202b", + "activityBar.inactiveForeground": "#15202b99", + "activityBarBadge.background": "#df9f9f", + "activityBarBadge.foreground": "#15202b", + "editorGroup.border": "#ffffff", + "panel.border": "#ffffff", + "sideBar.border": "#ffffff", + "statusBar.background": "#ffffff", + "statusBar.border": "#ffffff", + "statusBar.debuggingBackground": "#ffffff", + "statusBar.debuggingBorder": "#ffffff", + "statusBar.debuggingForeground": "#15202b", + "statusBar.foreground": "#15202b", + "statusBarItem.hoverBackground": "#e6e6e6", + "tab.activeBorder": "#ffffff", + "titleBar.activeBackground": "#eeeeee", + "titleBar.activeForeground": "#15202b", + "titleBar.border": "#eeeeee", + "titleBar.inactiveBackground": "#eeeeee99", + "titleBar.inactiveForeground": "#15202b99" + }, + "peacock.color": "#e6e6e6" } diff --git a/tools/check-git-version.mjs b/tools/check-git-version.mjs index f2ba0b6e104fd5..65b006acbefd85 100644 --- a/tools/check-git-version.mjs +++ b/tools/check-git-version.mjs @@ -12,9 +12,13 @@ const git = simpleGit(); const [gitVersion] = regex.exec(stdout); if (semver.lt(gitVersion, GIT_MINIMUM_VERSION)) { if (process.env.CI) { - shell.echo(`::error ::Minimum Git version ${GIT_MINIMUM_VERSION} is required`); + shell.echo( + `::error ::Minimum Git version ${GIT_MINIMUM_VERSION} is required` + ); } else { - throw new Error(`Minimum Git version ${GIT_MINIMUM_VERSION} is required`); + throw new Error( + `Minimum Git version ${GIT_MINIMUM_VERSION} is required` + ); } } shell.echo('Found git version: ', gitVersion); From 0fce1ac73fe94a384bb6cbe8b240541e61c7138e Mon Sep 17 00:00:00 2001 From: RahulGautamSingh Date: Wed, 15 Sep 2021 14:33:06 +0000 Subject: [PATCH 41/41] removed unwanted vscode config --- .vscode/settings.json | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f861c5e6bd196f..c192127b1fc5f6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,31 +14,5 @@ }, "omnisharp.autoStart": false, "jest.autoRun": "off", - "jest.jestCommandLine": "yarn jest", - "workbench.colorCustomizations": { - "activityBar.activeBackground": "#ffffff", - "activityBar.activeBorder": "#df9f9f", - "activityBar.background": "#ffffff", - "activityBar.foreground": "#15202b", - "activityBar.inactiveForeground": "#15202b99", - "activityBarBadge.background": "#df9f9f", - "activityBarBadge.foreground": "#15202b", - "editorGroup.border": "#ffffff", - "panel.border": "#ffffff", - "sideBar.border": "#ffffff", - "statusBar.background": "#ffffff", - "statusBar.border": "#ffffff", - "statusBar.debuggingBackground": "#ffffff", - "statusBar.debuggingBorder": "#ffffff", - "statusBar.debuggingForeground": "#15202b", - "statusBar.foreground": "#15202b", - "statusBarItem.hoverBackground": "#e6e6e6", - "tab.activeBorder": "#ffffff", - "titleBar.activeBackground": "#eeeeee", - "titleBar.activeForeground": "#15202b", - "titleBar.border": "#eeeeee", - "titleBar.inactiveBackground": "#eeeeee99", - "titleBar.inactiveForeground": "#15202b99" - }, - "peacock.color": "#e6e6e6" + "jest.jestCommandLine": "yarn jest" }