From 56951ba7d07ad92e6289a7b2290ffe350b5604fc Mon Sep 17 00:00:00 2001 From: Tamas Csillag Date: Fri, 22 Oct 2021 13:40:59 +0100 Subject: [PATCH 1/5] CORE-348: Trying to resolve a git error in the autobuild. --- versioncontrol/git.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index 5bcb0ba..c2f7046 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -104,13 +104,13 @@ def String checkouttoreporoot(String gitURL) { def checkgitlfsinstall() { if (isUnix()) { sh """ - git lfs install + git lfs install --skip-repo if [ \$? -ne 0 ]; then exit 1; fi """ } else { powershell """ - git lfs install + git lfs install --skip-repo if (\$lastexitcode -ge 1) { exit 1 } """ } From e67bec14df6246631ef9e22fb06e16ed83c2527e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 15 Jan 2022 21:04:36 +0000 Subject: [PATCH 2/5] When doing nested release repo imports - ignore components that have incomplete release info --- import/importer.groovy | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index 4948cad..90383b0 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -239,15 +239,18 @@ def hierarchyartifactimportfromrepo(meta, ImportOptions importoptions, String de def cloneurl = relatedmeta.releaseinfo.releaserepoURL def clonerevision = "refs/tags/${relatedmeta.releasetag()}" def clonepath = "${destpath}/${relatedoffsetpath}" - echo "Cloning release repo: ${cloneurl}, revision: ${clonerevision} at folder: ${clonepath}" - - gh.gitCheckoutAlt(cloneurl, clonerevision, clonepath, "", 1, true, []) - - gh.stripgithistory(clonepath) - - def metafilepath = "${clonepath}${relatedmeta.metafilepath()}" - echo "Marking related meta as released and rewriting meta file: ${metafilepath}" - rewritemetafileasreleased(relatedmeta, metafilepath) + if (relatedmeta.componentidentifier() != '___' && + relatedmeta.componentidentifier() != '_' && + cloneurl != '') { + echo "Cloning release repo: ${cloneurl}, revision: ${clonerevision} at folder: ${clonepath}" + gh.gitCheckoutAlt(cloneurl, clonerevision, clonepath, "", 1, true, []) + gh.stripgithistory(clonepath) + def metafilepath = "${clonepath}${relatedmeta.metafilepath()}" + echo "Marking related meta as released and rewriting meta file: ${metafilepath}" + rewritemetafileasreleased(relatedmeta, metafilepath) + } else { + echo "Not importing component that would be placed at path: ${clonepath}" + } } gh.stripgithistory(destpath) def metafilepath = "${destpath}/${meta.metafilepath()}" From b9f524061526dddd68e2195f4031e837a4232b53 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 16 Jan 2022 23:03:35 +0000 Subject: [PATCH 3/5] / missing when doing hierarchical release repo checkout --- import/importer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/import/importer.groovy b/import/importer.groovy index 4948cad..133cd10 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -245,7 +245,7 @@ def hierarchyartifactimportfromrepo(meta, ImportOptions importoptions, String de gh.stripgithistory(clonepath) - def metafilepath = "${clonepath}${relatedmeta.metafilepath()}" + def metafilepath = "${clonepath}/${relatedmeta.metafilepath()}" echo "Marking related meta as released and rewriting meta file: ${metafilepath}" rewritemetafileasreleased(relatedmeta, metafilepath) } From 9b89c0f629d2fc58b6b803693c685a1f1f40ccb6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 27 Jan 2022 11:26:20 +0000 Subject: [PATCH 4/5] CORE-348 - Reverse a debugging change --- versioncontrol/git.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index 2e7eade..a22054b 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -104,13 +104,13 @@ def String checkouttoreporoot(String gitURL) { def checkgitlfsinstall() { if (isUnix()) { sh """ - git lfs install --skip-repo + git lfs install if [ \$? -ne 0 ]; then exit 1; fi """ } else { powershell """ - git lfs install --skip-repo + git lfs install if (\$lastexitcode -ge 1) { exit 1 } """ } From 5575f2bd18cb7325eac43803d4297e998ba47918 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 28 Jan 2022 18:01:56 +0000 Subject: [PATCH 5/5] Don't attempt to import artifacts associated with components that do not have complete meta --- import/importer.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index 438410d..fa32ebf 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -239,8 +239,7 @@ def hierarchyartifactimportfromrepo(meta, ImportOptions importoptions, String de def cloneurl = relatedmeta.releaseinfo.releaserepoURL def clonerevision = "refs/tags/${relatedmeta.releasetag()}" def clonepath = "${destpath}/${relatedoffsetpath}" - if (relatedmeta.componentidentifier() != '___' && - relatedmeta.componentidentifier() != '_' && + if (relatedmeta.componentidentifier() != '_' && cloneurl != '') { echo "Cloning release repo: ${cloneurl}, revision: ${clonerevision} at folder: ${clonepath}" gh.gitCheckoutAlt(cloneurl, clonerevision, clonepath, "", 1, true, [])