Skip to content

Commit f3c1c4a

Browse files
committed
Re-enable stage dependencies
1 parent 600bf16 commit f3c1c4a

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

eng/common/templates/stages/dotnet/publish.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ parameters:
66
publicProjectName: null
77
pool: ""
88
isInternalServicingValidation: false
9+
isStandalonePublish: false
910
customPublishInitSteps: []
1011
sourceBuildPipelineDefinitionId: ''
1112
sourceBuildPipelineRunId: ''
@@ -16,6 +17,7 @@ stages:
1617
internalProjectName: ${{ parameters.internalProjectName }}
1718
publicProjectName: ${{ parameters.publicProjectName }}
1819
isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
20+
isStandalonePublish: ${{ parameters.isStandalonePublish }}
1921
sourceBuildPipelineDefinitionId: ${{ parameters.sourceBuildPipelineDefinitionId }}
2022
sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
2123

eng/common/templates/stages/publish.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ parameters:
66
publicProjectName: null
77

88
isInternalServicingValidation: false
9+
isStandalonePublish: false
910

1011
pool:
1112
vmImage: $(defaultLinuxAmd64PoolImage)
@@ -19,10 +20,11 @@ parameters:
1920
stages:
2021
- ${{ if eq(parameters.isInternalServicingValidation, 'false') }}:
2122
- stage: Publish
22-
# ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}:
23-
# dependsOn: Test
24-
# ${{ else }}:
25-
# dependsOn: Post_Build
23+
${{ if not(parameters.isStandalonePublish) }}:
24+
${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}:
25+
dependsOn: Test
26+
${{ else }}:
27+
dependsOn: Post_Build
2628
condition: "
2729
and(
2830
not(canceled()),

eng/pipelines/release-promotion.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@ extends:
2222
parameters:
2323
internalProjectName: ${{ variables.internalProjectName }}
2424
publicProjectName: ${{ variables.publicProjectName }}
25-
25+
isStandalonePublish: true
2626
# Only allow the dotnet-docker-release-staging pipeline as a source for publishing
2727
# https://dev.azure.com/dnceng/internal/_build?definitionId=1434
2828
sourceBuildPipelineDefinitionId: "1434"
2929
sourceBuildPipelineRunId: $(resources.pipeline.dotnet-docker-release-staging.runID)
30-
3130
customPublishInitSteps:
3231
- script: echo "##vso[task.setvariable variable=sourceBuildId]$(resources.pipeline.dotnet-docker-release-staging.runID)"
3332
displayName: Set sourceBuildId

eng/pipelines/stages/publish.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ parameters:
1414
- name: isInternalServicingValidation
1515
type: boolean
1616
default: false
17+
- name: isStandalonePublish
18+
type: boolean
19+
default: false
1720
- name: customPublishInitSteps
1821
type: stepList
1922
default: []
@@ -30,6 +33,7 @@ stages:
3033
internalProjectName: ${{ parameters.internalProjectName }}
3134
publicProjectName: ${{ parameters.publicProjectName }}
3235
isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
36+
isStandalonePublish: ${{ parameters.isStandalonePublish }}
3337
linuxAmd64Pool: ${{ parameters.linuxAmd64Pool }}
3438
customPublishInitSteps:
3539
- ${{ parameters.customPublishInitSteps }}

0 commit comments

Comments
 (0)