Skip to content

[CI environment] Fixed ADO Publish Job for Bicep Registry ordering for prerelease and feature branch publishing #3957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahmadabdalla merged 1 commit into from
Sep 12, 2023
Merged

[CI environment] Fixed ADO Publish Job for Bicep Registry ordering for prerelease and feature branch publishing #3957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .azuredevops/pipelineTemplates/jobs.publishModule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down Expand Up @@ -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
}
}
Expand Down Expand Up @@ -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 ##
#################
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/templates/publishModule/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down Expand Up @@ -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
}
}
Expand Down