Skip to content

Commit e51ba95

Browse files
committed
Work CI-CD
- Add condition to check for cancelled job. - Add condition to skip samples building when on merge commit (only runs on PR). ***NO_CI***
1 parent bec606a commit e51ba95

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

azure-pipelines.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,11 @@ jobs:
166166
###########################################################
167167
# build tool
168168
- job: Build_tool
169-
condition: ne(dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true)
169+
condition: >-
170+
and(
171+
succeeded(),
172+
ne(dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true)
173+
)
170174
dependsOn:
171175
- Check_Build_Options
172176

@@ -236,26 +240,28 @@ jobs:
236240
condition: >-
237241
and(
238242
succeeded(),
239-
eq(variables['UPDATE_DEPENDENTS'], 'false')
243+
eq(variables['UPDATE_DEPENDENTS'], 'false'),
244+
ne(variables['System.PullRequest.PullRequestId'], '')
240245
)
241246
displayName: Restore NuGet packages for Samples
242247
inputs:
243248
restoreSolution: '$(Build.SourcesDirectory)/Samples/Samples.sln'
244249
feedsToUse: config
245250
nugetConfigPath: '$(Build.SourcesDirectory)/Samples/nuget.config'
246-
251+
247252
- task: VSBuild@1
248253
displayName: Build Samples
249254
condition: >-
250255
and(
251256
succeeded(),
252-
eq(variables['UPDATE_DEPENDENTS'], 'false')
257+
eq(variables['UPDATE_DEPENDENTS'], 'false'),
258+
ne(variables['System.PullRequest.PullRequestId'], '')
253259
)
254260
inputs:
255261
solution: '$(Build.SourcesDirectory)/Samples/Samples.sln'
256262
platform: 'Any CPU'
257263
configuration: '$(buildConfiguration)'
258-
264+
259265
- task: PowerShell@2
260266
condition: >-
261267
and(

0 commit comments

Comments
 (0)