diff --git a/.azuredevops/pipelineTemplates/jobs.publishModule.yml b/.azuredevops/pipelineTemplates/jobs.publishModule.yml index 801409be31..21c3adbb92 100644 --- a/.azuredevops/pipelineTemplates/jobs.publishModule.yml +++ b/.azuredevops/pipelineTemplates/jobs.publishModule.yml @@ -179,7 +179,7 @@ jobs: $missingModules = Get-ModulesMissingFromUniversalArtifactsFeed @missingInputObject -BearerToken $env:TOKEN foreach($missingModule in $missingModules) { - if($modulsToPublish.TemplateFilePath -notcontains $missingModule.TemplateFilePath) { + if($modulesToPublish.TemplateFilePath -notcontains $missingModule.TemplateFilePath) { $modulesToPublish += $missingModule } } @@ -288,7 +288,7 @@ jobs: $missingModules = Get-ModulesMissingFromTemplateSpecsRG @missingInputObject foreach($missingModule in $missingModules) { - if($modulsToPublish.TemplateFilePath -notcontains $missingModule.TemplateFilePath) { + if($modulesToPublish.TemplateFilePath -notcontains $missingModule.TemplateFilePath) { $modulesToPublish += $missingModule } } @@ -397,6 +397,12 @@ jobs: $missingModules = Get-ModulesMissingFromPrivateBicepRegistry @missingInputObject + foreach($missingModule in $missingModules) { + if($modulesToPublish.TemplateFilePath -notcontains $missingModule.TemplateFilePath) { + $modulesToPublish += $missingModule + } + } + # Filter modules to publish 'prerelease' only if branch is not main/master $BranchName = '$(Build.SourceBranch)' if ($BranchName -ne 'refs/heads/main' -and $BranchName -ne 'refs/heads/master') { @@ -404,12 +410,6 @@ jobs: $modulesToPublish = $modulesToPublish | Where-Object -Property version -like '*-prerelease' } - foreach($missingModule in $missingModules) { - if($modulsToPublish.TemplateFilePath -notcontains $missingModule.TemplateFilePath) { - $modulesToPublish += $missingModule - } - } - ################# ## Publish ## ################# diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml index 7645e7eb21..5747f97811 100644 --- a/.github/actions/templates/publishModule/action.yml +++ b/.github/actions/templates/publishModule/action.yml @@ -136,7 +136,7 @@ runs: $missingModules = Get-ModulesMissingFromTemplateSpecsRG @missingInputObject foreach($missingModule in $missingModules) { - if($modulsToPublish.TemplateFilePath -notcontains $missingModule.TemplateFilePath) { + if($modulesToPublish.TemplateFilePath -notcontains $missingModule.TemplateFilePath) { $modulesToPublish += $missingModule } } @@ -224,7 +224,7 @@ runs: $missingModules = Get-ModulesMissingFromPrivateBicepRegistry @missingInputObject foreach($missingModule in $missingModules) { - if($modulsToPublish.TemplateFilePath -notcontains $missingModule.TemplateFilePath) { + if($modulesToPublish.TemplateFilePath -notcontains $missingModule.TemplateFilePath) { $modulesToPublish += $missingModule } }