Merge branch 'master' into MultiClusterSingleDatastore
This commit is contained in:
+8
-8
@@ -18,11 +18,11 @@ pr:
|
||||
|
||||
jobs:
|
||||
# Windows PowerShell 5.1 Build Job
|
||||
- job: Build_PS_Win2016
|
||||
- job: Build_PS_Windows
|
||||
timeoutInMinutes: 10
|
||||
cancelTimeoutInMinutes: 2
|
||||
pool:
|
||||
vmImage: vs2017-win2016
|
||||
vmImage: windows-latest
|
||||
steps:
|
||||
# Run build.ps1 script in PowerShell Core
|
||||
- powershell: |
|
||||
@@ -46,11 +46,11 @@ jobs:
|
||||
|
||||
|
||||
# Windows PowerShell Core Build Job
|
||||
- job: Build_PSCore_Win2016
|
||||
- job: Build_PSCore_Windows
|
||||
timeoutInMinutes: 10
|
||||
cancelTimeoutInMinutes: 2
|
||||
pool:
|
||||
vmImage: vs2017-win2016
|
||||
vmImage: windows-latest
|
||||
steps:
|
||||
# Run build.ps1 script in PowerShell Core
|
||||
- pwsh: |
|
||||
@@ -73,11 +73,11 @@ jobs:
|
||||
condition: always()
|
||||
|
||||
# Linux Build Job
|
||||
- job: Build_PSCore_Ubuntu1604
|
||||
- job: Build_PSCore_Ubuntu
|
||||
timeoutInMinutes: 10
|
||||
cancelTimeoutInMinutes: 2
|
||||
pool:
|
||||
vmImage: ubuntu-16.04
|
||||
vmImage: ubuntu-latest
|
||||
steps:
|
||||
# Run build.ps1 script in PowerShell Core
|
||||
- pwsh: |
|
||||
@@ -112,11 +112,11 @@ jobs:
|
||||
condition: always()
|
||||
|
||||
# MacOS Build Job
|
||||
- job: Build_PSCore_MacOS1013
|
||||
- job: Build_PSCore_MacOS
|
||||
timeoutInMinutes: 10
|
||||
cancelTimeoutInMinutes: 2
|
||||
pool:
|
||||
vmImage: xcode9-macos10.13
|
||||
vmImage: macOS-latest
|
||||
steps:
|
||||
# Run build.ps1 script in PowerShell Core
|
||||
- pwsh: |
|
||||
|
||||
Reference in New Issue
Block a user