Skip to content

Commit

Permalink
Merge branch 'master' into split_out_integration
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyriar authored May 21, 2019
2 parents f81d1cb + 209c448 commit 9a4f419
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
- macOS
- Windows
- IntegrationTests
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/release/*')))
pool:
vmImage: 'ubuntu-16.04'
steps:
Expand Down

0 comments on commit 9a4f419

Please sign in to comment.