[CI Platform] Fixed ADO Publish Bicep Registry Job ordering bug for p…

…rerelease branches (#3957) The filtering option was placed in the wrong sequence.
Azure · Sep 12, 2023 · 68c63fc · 68c63fc
1 parent 830f92d
commit 68c63fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git 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,19 +397,19 @@ 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') {
               Write-Verbose "Filtering modules to only publish a [prerelease] version as the current branch [$BranchName] is not [main/master]." -Verbose
               $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
@@ -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
             }
           }