From efc2ce75ed08d164fd02a3ee61b007ec5b68e642 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 30 Jun 2021 23:04:07 +0100 Subject: [PATCH] Convert bat to powershell; Remove debug --- configuration/configuration.groovy | 6 ---- differences/json.groovy | 46 ++++++++++++++++++------------ meta/folder.groovy | 1 - versionnumbering/do.groovy | 2 +- versionnumbering/generate.groovy | 8 +++--- 5 files changed, 33 insertions(+), 30 deletions(-) diff --git a/configuration/configuration.groovy b/configuration/configuration.groovy index b06c931..2a7f1ab 100644 --- a/configuration/configuration.groovy +++ b/configuration/configuration.groovy @@ -1,7 +1,6 @@ gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") def registerConfigurationInfo(meta, String configurationName, String configurationURL, String configurationVersion, String configurationSHA) { - echo "I am here 2" meta.addConfigurationInfo(configurationName, configurationURL, configurationVersion, configurationSHA) } @@ -13,12 +12,7 @@ def gitCheckoutAndRegister(meta, String tool, String gitURL, String revision, St def ArrayList sparseitemlist = gh.convertSparseItemsString(filter) gh.gitCheckoutAlt(gitURL, revision, targetDir, repoRoot, cloneDepth, shallowClone) - echo "I am here 1" - registerConfigurationInfo(meta, tool, gitURL, revision, gh.getGitInfo(targetDir)) - - echo("I am here 4") - } return this diff --git a/differences/json.groovy b/differences/json.groovy index 78df0bd..7f2b662 100644 --- a/differences/json.groovy +++ b/differences/json.groovy @@ -10,31 +10,41 @@ def comparefiles(importedjsonfile, currentjsonfile) { } else { // Jq and diffutils can be installed on windows with chocolatey - bat """ - REM echo Checking utilities exist - REM set - REM echo %PATH% - where jq - if errorlevel 1 EXIT /b 1 - where diff - if errorlevel 1 EXIT /b 1 + powershell """ + # echo Checking utilities exist + # set + # echo %PATH% + try { + if (Get-Command jq) {} + } + catch { + echo "jq is unavailable" + exit $false + } + try { + if (Get-Command diff) {} + } + catch { + echo "diff is unavailable" + exit $false + } - REM echo Sorting json in files to compare - REM jq -S sorts json output + # echo Sorting json in files to compare + # jq -S sorts json output jq -S . "${importedjsonfile}" > temp1.txt - if errorlevel 1 EXIT /b 1 + if (\$lastexitcode -ge 1) { exit 1 } jq -S . "${importedjsonfile}" > temp2.txt - if errorlevel 1 EXIT /b 1 + if (\$lastexitcode -ge 1) { exit 1 } - REM echo Diffing sorted json files + # echo Diffing sorted json files diff -c temp1.txt temp2.txt - set el=%errorlevel% + \$el = \$lastexitcode - del temp1.txt - del temp2.txt + Remove-Item temp1.txt + Remove-Item temp2.txt - REM echo Diffing result: %el% - if %el% GEQ 1 EXIT /b 1 + # echo Diffing result: \$el + if (\$el -ge 1) { exit 1 } """ } } diff --git a/meta/folder.groovy b/meta/folder.groovy index 0fbcc8d..704bfc8 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -526,7 +526,6 @@ class MetaInfo extends GISJsonSerialised { } void addConfigurationInfo(String configurationname, String configurationURL, String configurationversion, String configurationSHA) { - script.echo("I am here 3") def ConfigurationInfo ci = new ConfigurationInfo(script, configurationname, configurationURL, configurationversion, configurationSHA) script.echo("Adding configuration info: name: ${configurationname} url: ${configurationURL} version: ${configurationversion} sha: ${configurationSHA}") configurationinfo.add(ci) diff --git a/versionnumbering/do.groovy b/versionnumbering/do.groovy index 9f45f70..f2a64ca 100644 --- a/versionnumbering/do.groovy +++ b/versionnumbering/do.groovy @@ -13,7 +13,7 @@ def stamp(convertdetails) { """ } else { - bat """ + powershell """ "${PYTHON}" -u "${stampscript}" -f "${filetoconvert}" -p "${pattern}" -s "${replacement}" """ } diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 71d7bf6..405b7be 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -28,7 +28,7 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim().toInteger() } else { - changecount = bat(returnStdout: true, script: "@git rev-list HEAD --count").trim().toInteger() + changecount = powershell(returnStdout: true, script: "git rev-list HEAD --count").trim().toInteger() } echo "Change count: ${changecount}" def int mvnp1 = maxversionnumber() + 1 @@ -39,21 +39,21 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { gitrevision = sh(returnStdout: true, script: "git rev-parse HEAD").trim() } else { - gitrevision = bat(returnStdout: true, script: "@git rev-parse HEAD").trim() + gitrevision = powershell(returnStdout: true, script: "git rev-parse HEAD").trim() } echo "Revision: ${gitrevision}" if (isUnix()) { remoteinfo = sh(returnStdout: true, script: "git remote show origin").trim() } else { - remoteinfo = bat(returnStdout: true, script: "@git remote show origin").trim() + remoteinfo = powershell(returnStdout: true, script: "git remote show origin").trim() } echo "Remote info: ${remoteinfo}" if (isUnix()) { remoteurl = sh(returnStdout: true, script: "git config --get remote.origin.url").trim() } else { - remoteurl = bat(returnStdout: true, script: "@git config --get remote.origin.url").trim() + remoteurl = powershell(returnStdout: true, script: "git config --get remote.origin.url").trim() } echo "Remote URL: ${remoteurl}" }