Merge branch 'main' into main

eriqua · Nov 30, 2023 · b5ed4b2 · b5ed4b2
2 parents 81e7519 + 1180d89
commit b5ed4b2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/avm/utilities/pipelines/publish/Publish-ModuleFromPathToPBR.ps1 b/avm/utilities/pipelines/publish/Publish-ModuleFromPathToPBR.ps1
@@ -33,7 +33,7 @@ function Publish-ModuleFromPathToPBR {
   # Load used functions
   . (Join-Path $PSScriptRoot 'helper' 'Get-ModulesToPublish.ps1')
   . (Join-Path $PSScriptRoot 'helper' 'Get-ModuleTargetVersion.ps1')
-  . (Join-Path $PSScriptRoot 'helper' 'Get-BRMRepositoryName.ps1')
+  . (Join-Path (Split-Path $PSScriptRoot) 'sharedScripts' 'Get-BRMRepositoryName.ps1')
   . (Join-Path $PSScriptRoot 'helper' 'New-ModuleReleaseTag.ps1')
   . (Join-Path $PSScriptRoot 'helper' 'Get-ModuleReadmeLink.ps1')
   . (Join-Path (Split-Path $PSScriptRoot -Parent) 'sharedScripts' 'tokenReplacement' 'Convert-TokensInFileList.ps1')

diff --git a/avm/utilities/pipelines/publish/Publish-ModuleFromTagToPBR.ps1 b/avm/utilities/pipelines/publish/Publish-ModuleFromTagToPBR.ps1
@@ -10,7 +10,7 @@ function Publish-ModuleFromTagToPBR {
   )
 
   # Load used functions
-  . (Join-Path $PSScriptRoot 'helper' 'Get-BRMRepositoryName.ps1')
+  . (Join-Path (Split-Path $PSScriptRoot) 'sharedScripts' 'Get-BRMRepositoryName.ps1')
   . (Join-Path $PSScriptRoot 'helper' 'Get-ModuleReadmeLink.ps1')
   . (Join-Path (Split-Path $PSScriptRoot -Parent) 'sharedScripts' 'tokenReplacement' 'Convert-TokensInFileList.ps1')
 

diff --git a/.../publish/helper/Get-BRMRepositoryName.ps1 → ...s/sharedScripts/Get-BRMRepositoryName.ps1 b/.../publish/helper/Get-BRMRepositoryName.ps1 → ...s/sharedScripts/Get-BRMRepositoryName.ps1
diff --git a/avm/utilities/pipelines/sharedScripts/Set-ModuleReadMe.ps1 b/avm/utilities/pipelines/sharedScripts/Set-ModuleReadMe.ps1
@@ -1631,7 +1631,7 @@ function Set-ModuleReadMe {
     . (Join-Path $PSScriptRoot 'helper' 'Get-IsParameterRequired.ps1')
     . (Join-Path $PSScriptRoot 'helper' 'Get-SpecsAlignedResourceName.ps1')
     . (Join-Path $PSScriptRoot 'helper' 'ConvertTo-OrderedHashtable.ps1')
-    . (Join-Path (Split-Path $PSScriptRoot -Parent) 'publish' 'helper' 'Get-BRMRepositoryName.ps1')
+    . (Join-Path $PSScriptRoot 'Get-BRMRepositoryName.ps1')
 
     # Check template & make full path
     $TemplateFilePath = Resolve-Path -Path $TemplateFilePath -ErrorAction Stop

diff --git a/avm/utilities/pipelines/staticValidation/compliance/helper/helper.psm1 b/avm/utilities/pipelines/staticValidation/compliance/helper/helper.psm1
@@ -9,7 +9,7 @@ $repoRootPath = (Get-Item $PSScriptRoot).Parent.Parent.Parent.Parent.Parent.Pare
 . (Join-Path $repoRootPath 'avm' 'utilities' 'pipelines' 'sharedScripts' 'helper' 'Get-IsParameterRequired.ps1')
 . (Join-Path $repoRootPath 'avm' 'utilities' 'pipelines' 'sharedScripts' 'helper' 'ConvertTo-OrderedHashtable.ps1')
 . (Join-Path $repoRootPath 'avm' 'utilities' 'pipelines' 'sharedScripts' 'helper' 'Get-CrossReferencedModuleList.ps1')
-. (Join-Path $repoRootPath 'avm' 'utilities' 'pipelines' 'publish' 'helper' 'Get-BRMRepositoryName.ps1')
+. (Join-Path $repoRootPath 'avm' 'utilities' 'pipelines' 'sharedScripts' 'Get-BRMRepositoryName.ps1')
 
 ####################################
 #   Load test-specific functions   #