diff options
| author | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-09-17 16:45:18 +0200 |
|---|---|---|
| committer | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-09-17 16:45:18 +0200 |
| commit | f8fed4922539d39eedb4c8907ce0d4fe13487b2a (patch) | |
| tree | 09e56fac78069c3e10293c81441743f0ff77d023 | |
| parent | 8b438b68ccfb623fcc1cd1af715944481f01ad5c (diff) | |
Another condition update.
| -rw-r--r-- | .ci/azure-pipelines.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index e124647f3..c58cb7a38 100644 --- a/.ci/azure-pipelines.yml +++ b/.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)' |