Skip to content

Commit 6f1cdb5

Browse files
committed
Work CD-CI
- Fix condition for NXP build, changelog and report failure jobs. Signed-off-by: josesimoes <[email protected]>
1 parent 9174843 commit 6f1cdb5

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

azure-pipelines.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,7 @@ jobs:
244244
#################
245245
# NXP
246246
- job: Build_NXP_targets
247-
# skip build if this is a PR, submitted by nfbot and the commit message contains [version update]
248-
# not( and( eq(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.RequestedForId'], 'nfbot'), contains(variables['Build.SourceVersionMessage'], '[version update]') ) )
249-
condition: not( and( startsWith(variables['Build.SourceBranch'], 'refs/pull'), eq( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ) ))
247+
condition: not( eq( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ) )
250248

251249
dependsOn:
252250
- Check_Build_Options
@@ -353,7 +351,7 @@ jobs:
353351
- Build_NXP_targets
354352
- Build_TI_SimpleLink_targets
355353
# skip build if this is a PR, submitted by nfbot and the commit message contains [version update]
356-
condition: and( succeeded('Build_STM32_targets'), succeeded('Build_ESP32_targets'), succeeded('Build_NXP_targets'), succeeded('Build_TI_SimpleLink_targets'), not( eq(variables['Build.Reason'], 'PullRequest') ), not( and( eq(variables['Build.RequestedForId'], 'nfbot'), contains(variables['Build.SourceVersionMessage'], '[version update]') ) ) )
354+
condition: and( succeeded('Build_STM32_targets'), succeeded('Build_ESP32_targets'), succeeded('Build_NXP_targets'), succeeded('Build_TI_SimpleLink_targets'), not( eq(variables['Build.Reason'], 'PullRequest') ), or( eq(variables['Build.SourceBranchName'], 'master'), startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), ne( variables['StartReleaseCandidate'], true ) )
357355

358356
pool:
359357
vmImage: 'VS2017-Win2016'
@@ -388,15 +386,15 @@ jobs:
388386
gem install github_changelog_generator --quiet --no-document
389387
# need to call it passing both cache options with full path otherwise it won't work
390388
github_changelog_generator --token $(GitHubToken) --cache-log $env:AGENT_TEMPDIRECTORY\github-changelog-logger.log --cache-file $env:AGENT_TEMPDIRECTORY\github-changelog-http-cache --pr-wo-labels --future-release "v$(NBGV_Version)"
391-
condition: and( succeeded(), not( startsWith(variables['Build.SourceBranch'], 'refs/pull') ), or( eq(variables['Build.SourceBranchName'], 'master'), contains(variables['Build.SourceBranchName'], 'release') ), ne( variables['StartReleaseCandidate'], true ) )
389+
condition: and( succeeded(), not( startsWith(variables['Build.SourceBranch'], 'refs/pull') ), or( eq(variables['Build.SourceBranchName'], 'master'), startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ) )
392390
displayName: Generate change log
393391
394392
# generate change log without future version
395393
- powershell: |
396394
gem install github_changelog_generator --quiet --no-document
397395
# need to call it passing both cache options with full path otherwise it won't work
398396
github_changelog_generator --token $(GitHubToken) --cache-log $env:AGENT_TEMPDIRECTORY\github-changelog-logger.log --cache-file $env:AGENT_TEMPDIRECTORY\github-changelog-http-cache --pr-wo-labels
399-
condition: and( succeeded(), not( startsWith(variables['Build.SourceBranch'], 'refs/pull') ), not( or( eq(variables['Build.SourceBranchName'], 'master'), contains(variables['Build.SourceBranchName'], 'release') ) ), ne( variables['StartReleaseCandidate'], true ) )
397+
condition: and( succeeded(), not( startsWith(variables['Build.SourceBranch'], 'refs/pull') ), not( or( eq(variables['Build.SourceBranchName'], 'master'), startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ) ) )
400398
displayName: Generate change log
401399
402400
# push new changelog to GitHub repo
@@ -414,7 +412,7 @@ jobs:
414412
$auth = "basic $([System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("nfbot:$(GitHubToken)"))))"
415413
416414
git -c http.extraheader="AUTHORIZATION: $auth" push origin "HEAD:$(Build.SourceBranchName)"
417-
condition: and( succeeded(), not( startsWith(variables['Build.SourceBranch'], 'refs/pull') ), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), ne( variables['StartReleaseCandidate'], true ) )
415+
condition: and( succeeded(), not( startsWith(variables['Build.SourceBranch'], 'refs/pull') ) )
418416
displayName: Push changelog to GitHub
419417
420418
#######################
@@ -423,6 +421,7 @@ jobs:
423421
dependsOn:
424422
- Build_STM32_targets
425423
- Build_ESP32_targets
424+
- Build_NXP_targets
426425
- Build_TI_SimpleLink_targets
427426
- Build_WIN32_nanoCLR
428427
- Generate_change_log
@@ -458,7 +457,8 @@ jobs:
458457
- Build_NXP_targets
459458
- Build_TI_SimpleLink_targets
460459
- Build_WIN32_nanoCLR
461-
condition: or( failed('Build_STM32_targets'), failed('Build_ESP32_targets'), failed('Build_NXP_targets'), failed('Build_TI_SimpleLink_targets'), failed('Build_WIN32_nanoCLR'))
460+
- Generate_change_log
461+
condition: or( failed('Build_STM32_targets'), failed('Build_ESP32_targets'), failed('Build_NXP_targets'), failed('Build_TI_SimpleLink_targets'), failed('Build_WIN32_nanoCLR'), failed('Generate_change_log'))
462462

463463
pool:
464464
vmImage: 'VS2017-Win2016'

0 commit comments

Comments
 (0)