Browse Source

Another condition update.

Erwin de Haan 5 năm trước cách đây
mục cha
commit
f8fed49225
1 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 4 4
      .ci/azure-pipelines.yml

+ 4 - 4
.ci/azure-pipelines.yml

@@ -32,14 +32,14 @@ jobs:
 
     - task: CmdLine@2
       displayName: "Update submodules"
-      condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
+      condition: and(succeeded(), or(contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
       inputs:
         script: 'git submodule foreach --recursive git checkout $(Build.SourceBranch)'
         workingDirectory: '$(Build.SourcesDirectory)'
 
     - task: CmdLine@2
       displayName: "Update submodules (PR)"
-      condition: and(succeeded(), or(startsWith(variables['System.PullRequest.TargetBranch'], 'refs/heads/release-'), eq(variables['System.PullRequest.TargetBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest'))
+      condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest'))
       inputs:
         script: 'git submodule foreach --recursive git checkout $(System.PullRequest.TargetBranch)'
         workingDirectory: '$(Build.SourcesDirectory)'
@@ -105,14 +105,14 @@ jobs:
 
     - task: CmdLine@2
       displayName: "Update submodules"
-      condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
+      condition: and(succeeded(), or(contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
       inputs:
         script: 'git submodule foreach --recursive git checkout $(Build.SourceBranch)'
         workingDirectory: '$(Build.SourcesDirectory)'
 
     - task: CmdLine@2
       displayName: "Update submodules (PR)"
-      condition: and(succeeded(), or(startsWith(variables['System.PullRequest.TargetBranch'], 'refs/heads/release-'), eq(variables['System.PullRequest.TargetBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest'))
+      condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest'))
       inputs:
         script: 'git submodule foreach --recursive git checkout $(System.PullRequest.TargetBranch)'
         workingDirectory: '$(Build.SourcesDirectory)'