Skip to content

Commit 5ebfa31

Browse files
committed
fix: coalsace other optional params
1 parent bb78a32 commit 5ebfa31

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

Setup/azure-pipelines-deploy-jobs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ steps:
7272
--parameters adoOrganizationUrl="${{ parameters.adoOrganizationUrl }}" `
7373
--parameters adoProjectName="${{ parameters.adoProjectName }}" `
7474
--parameters adoRepositoryName="${{ parameters.adoRepositoryName }}" `
75-
--parameters azureTenantId="${{ parameters.azureTenantId }}" `
76-
--parameters azureClientId="${{ parameters.azureClientId }}" `
77-
--parameters azureClientSecret="${{ parameters.azureClientSecret }}" `
75+
--parameters entraIdTenantId="${{ parameters.azureTenantId }}" `
76+
--parameters entraIdClientId="${{ parameters.azureClientId }}" `
77+
--parameters entraIdClientSecret="${{ parameters.azureClientSecret }}" `
7878
--parameters enableEntraIdAuth=${{ parameters.enableEntraIdAuth }} `
7979
--parameters disablePasswordAuth=${{ parameters.disablePasswordAuth }} `
8080
--parameters entraIdAllowedGroups="${{ parameters.entraIdAllowedGroups }}" `

Setup/azure-pipelines-external.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ stages:
9595
websiteName: $(WebsiteName)
9696
adoOrganizationUrl: $(System.CollectionUri)
9797
adoProjectName: $(System.TeamProject)
98-
adoRepositoryName: $(AdoRepositoryName)
98+
adoRepositoryName: ${{ coalesce(variables.AdoRepositoryName, '') }}
9999
enableEntraIdAuth: ${{ coalesce(variables.EnableEntraIdAuth, false) }}
100-
azureTenantId: $(AzureTenantId)
101-
azureClientId: $(AzureClientId)
102-
azureClientSecret: $(AzureClientSecret)
103-
entraIdAllowedGroups: $(EntraIdAllowedGroups)
100+
azureTenantId: ${{ coalesce(variables.AzureTenantId, '') }}
101+
azureClientId: ${{ coalesce(variables.AzureClientId, '') }}
102+
azureClientSecret: ${{ coalesce(variables.AzureClientSecret, '') }}
103+
entraIdAllowedGroups: ${{ coalesce(variables.EntraIdAllowedGroups, '') }}
104104
disablePasswordAuth: ${{ coalesce(variables.DisablePasswordAuth, false) }}

0 commit comments

Comments
 (0)