From 5acabbfa9d227617e087b19ce85a0c1f33f0f102 Mon Sep 17 00:00:00 2001
From: Frankly George <54015-franklygeorge@users.noreply.gitgud.io>
Date: Fri, 22 Mar 2024 16:34:53 +0000
Subject: [PATCH] Sanity check improvements
---
devTools/scripts/detectChanges.js | 18 +++++++++++++-----
devTools/scripts/sanityCheck.js | 7 ++++++-
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/devTools/scripts/detectChanges.js b/devTools/scripts/detectChanges.js
index 600bd1098fd..1bb83249330 100644
--- a/devTools/scripts/detectChanges.js
+++ b/devTools/scripts/detectChanges.js
@@ -128,13 +128,21 @@ class ChangeParser {
* Fetches and updates pregmodfan/pregmod-master as upstream/pregmod-master
*/
fetchOrigin() {
- let command = "git remote";
- if (!(execSync(command).toString().includes("upstream"))) {
- command = "git remote add upstream https://gitgud.io/pregmodfan/fc-pregmod.git/";
+ try {
+ let command = "git remote";
+ if (!(execSync(command).toString().includes("upstream"))) {
+ command = "git remote add upstream https://gitgud.io/pregmodfan/fc-pregmod.git/";
+ execSync(command);
+ }
+ command = "git fetch --quiet upstream pregmod-master";
execSync(command);
+ } catch (e) {
+ if (e.message.includes("Could not resolve host")) {
+ // fail silently
+ } else {
+ throw e;
+ }
}
- command = "git fetch --quiet upstream pregmod-master";
- execSync(command);
}
/**
diff --git a/devTools/scripts/sanityCheck.js b/devTools/scripts/sanityCheck.js
index 2b117ff3dcb..a4d94353f3b 100644
--- a/devTools/scripts/sanityCheck.js
+++ b/devTools/scripts/sanityCheck.js
@@ -88,7 +88,12 @@ if (args.staged === true) {
if (stagedFiles === null) {
stagedFiles = undefined;
}
-} else {
+} else if (
+ (settings.checksEnableCustom === true && settings.checksOnlyChangedCustom === true) ||
+ (settings.checksEnableESLint === true && settings.checksOnlyChangedESLint === true) ||
+ (settings.checksEnableSpelling === true && settings.checksOnlyChangedSpelling === true) ||
+ (settings.checksEnableTypescript === true && settings.checksOnlyChangedTypescript === true)
+) {
// @ts-ignore
await parser.init(args.interaction);
}
--
GitLab