Skip to content

Commit

Permalink
Merge pull request #78 from AArnott/removeMacOS
Browse files Browse the repository at this point in the history
Remove macOS from Azure Pipeline runs
  • Loading branch information
pr-autocomplete[bot] authored Nov 2, 2020
2 parents 1719367 + 1ba2012 commit 5666dc8
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
8 changes: 8 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ trigger:
- .vscode/
- .github/

parameters:
- name: includeMacOS
displayName: Build on macOS
type: boolean
default: false # macOS is often bogged down in Azure Pipelines

variables:
TreatWarningsAsErrors: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
Expand All @@ -20,3 +26,5 @@ variables:

jobs:
- template: azure-pipelines/build.yml
parameters:
includeMacOS: ${{ parameters.includeMacOS }}
4 changes: 4 additions & 0 deletions azure-pipelines/build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
parameters:
windowsPool: Hosted Windows 2019 with VS2019
includeMacOS:

jobs:
- job: Windows
Expand All @@ -26,6 +27,7 @@ jobs:
- template: expand-template.yml

- job: macOS
condition: ${{ parameters.includeMacOS }}
pool:
vmImage: macOS-10.15
steps:
Expand All @@ -50,4 +52,6 @@ jobs:
parameters:
initArgs: -NoRestore
- template: publish-codecoverage.yml
parameters:
includeMacOS: ${{ parameters.includeMacOS }}
- template: publish-deployables.yml
4 changes: 4 additions & 0 deletions azure-pipelines/publish-codecoverage.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
parameters:
includeMacOS:

steps:
- download: current
artifact: coverageResults-Windows
Expand All @@ -11,6 +14,7 @@ steps:
artifact: coverageResults-macOS
displayName: Download macOS code coverage results
continueOnError: true
condition: ${{ parameters.includeMacOS }}
- powershell: |
dotnet tool install --tool-path obj dotnet-reportgenerator-globaltool --version 4.2.2 --configfile azure-pipelines/justnugetorg.nuget.config
Copy-Item -Recurse $(Pipeline.Workspace)/coverageResults-Windows/obj/* $(System.DefaultWorkingDirectory)/obj
Expand Down

0 comments on commit 5666dc8

Please sign in to comment.