Skip to content

Commit

Permalink
Merge pull request #43 Use pull-request.yml for PR and CI builds
Browse files Browse the repository at this point in the history
Use pull-request.yml for PR and CI builds
  • Loading branch information
wilbaker authored Aug 13, 2019
2 parents e2366ae + 9a98515 commit bfcb6a6
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 72 deletions.
66 changes: 0 additions & 66 deletions .azure-pipelines/continuous-integration.yml

This file was deleted.

29 changes: 23 additions & 6 deletions .azure-pipelines/pull-request.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
name: $(date:yy)$(DayOfYear)$(rev:.r)

trigger: none
trigger:
- master
- releases/shipped

pr:
- master
- milestones/*
- releases/*
- servicing/*
- master
- milestones/*
- releases/*
- servicing/*

variables:
majorAndMinorVersion: '0.4'
revision: '$(Build.BuildNumber)'
platform: 'x64'
configuration: release

jobs:
- job: Windows_Build_and_UnitTests
variables:
platformFriendlyName: Windows
strategy:
maxParallel: 2
matrix:
debug:
configuration: Debug
release:
configuration: Release
pool:
vmImage: vs2017-win2016
steps:
Expand All @@ -26,6 +34,13 @@ jobs:
- job: macOS_Build_and_UnitTests
variables:
platformFriendlyName: macOS
strategy:
maxParallel: 2
matrix:
debug:
configuration: Debug
release:
configuration: Release
pool:
name: 'Hosted macOS'
steps:
Expand All @@ -34,6 +49,7 @@ jobs:
- job: macOS_FunctionalTests
variables:
platformFriendlyName: macOS
configuration: Release
timeoutInMinutes: 30
pool:
name: 'Hosted macOS'
Expand All @@ -47,6 +63,7 @@ jobs:
timeoutInMinutes: 30
variables:
platformFriendlyName: Windows
configuration: Release
pool:
vmImage: vs2017-win2016
dependsOn: Windows_Build_and_UnitTests
Expand Down

0 comments on commit bfcb6a6

Please sign in to comment.