From f251bb6b96914017bbd8d9cd784a9def97238d7c Mon Sep 17 00:00:00 2001 From: "george.linsdell" Date: Fri, 8 Jan 2021 17:21:48 +0000 Subject: [PATCH 1/4] more patchy patchy by extending the timeout for fetch as the repo is apparently huge. --- versioncontrol/git.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index f5b2ebd..de9e244 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -195,8 +195,8 @@ def docheckout(String gitURL, String revision, int cloneDepth, String reporootpa ], doGenerateSubmoduleConfigurations: false, extensions: [ - [$class: 'GitLFSPull'], - [$class: 'CleanBeforeCheckout'], + [$class: 'GitLFSPull',timeout: 25], + [$class: 'CleanBeforeCheckout',timeout: 20], [$class: 'CloneOption', depth: cloneDepth, noTags: false, reference: reporootpath, shallow: shallowClone, timeout: 120], [$class: 'CheckoutOption', timeout: 120], [$class: 'RelativeTargetDirectory', relativeTargetDir: targetDir], From 26d4aa2ff8f9f84463706d883d45662ee2358bfc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 8 Sep 2021 13:24:09 +0100 Subject: [PATCH 2/4] Correct powershell redirection to null --- versioncontrol/git.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index 9a72e9d..50f4025 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -265,9 +265,9 @@ def gitsparserestore(String targetDir) { """ } else { powershell """ - git rm -rf . 2> nul - git clean -fxd 2> nul - git reset --hard 2> nul + git rm -rf . > \$null + git clean -fxd > \$null + git reset --hard > \$null """ } } From 676122557aadf45c3e6d1b314b00df1e03edd8aa Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 10 Sep 2021 16:18:26 +0100 Subject: [PATCH 3/4] Show which files are being compared --- differences/file.groovy | 1 + differences/json.groovy | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/differences/file.groovy b/differences/file.groovy index aa4814a..ee1b8b3 100644 --- a/differences/file.groovy +++ b/differences/file.groovy @@ -1,4 +1,5 @@ def comparefiles(importedfile, currentfile, boolean ignorewhitespace = true) { + echo "Comparing file: ${importedfile} with: ${currentfile} option: ${ignorewhitespace}" def wsparameter = "-w" if (!ignorewhitespace) { wsparameter = "" diff --git a/differences/json.groovy b/differences/json.groovy index 0556188..dbf47b8 100644 --- a/differences/json.groovy +++ b/differences/json.groovy @@ -1,5 +1,5 @@ def comparefiles(importedjsonfile, currentjsonfile) { - echo "Comparing file: ${importedjsonfile} with: ${currentjsonfile}" + echo "Comparing json file: ${importedjsonfile} with: ${currentjsonfile}" if (isUnix()) { sh """ which jq From fa5a9493efdc83a42d1dfbcb37b07713aac04fa1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 16 Sep 2021 16:01:32 +0100 Subject: [PATCH 4/4] Handle misspelling --- publish/promptingpublish.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/publish/promptingpublish.groovy b/publish/promptingpublish.groovy index 4af0d62..21de708 100644 --- a/publish/promptingpublish.groovy +++ b/publish/promptingpublish.groovy @@ -62,6 +62,7 @@ pipeline { echo("Showing filtered releases") for (release in allreleases) { if (!release.toLowerCase().startsWith("superceded") && + !release.toLowerCase().startsWith("superseded") && !release.toLowerCase().startsWith("erroneous") && !release.toLowerCase().startsWith("faulty") && !release.toLowerCase().startsWith("ignore") &&