Commit b3ea4a516ffac5324c2e2dedc7624949f2af5aff
2018-10-12T12:08:00
Update .vsts-ci.yml (cherry picked from commit 7238a1e8c7e6b48439ce553c99b83915cb33b394)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 36ce777..be8cdb3 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -5,11 +5,11 @@ trigger:
- master
- maint/*
-phases:
-- phase: linux_trusty_gcc_openssl
+jobs:
+- job: linux_trusty_gcc_openssl
displayName: 'Linux (Trusty; GCC; OpenSSL)'
- queue:
- name: 'Hosted Linux Preview'
+ pool:
+ vmImage: 'Ubuntu 16.04'
steps:
- task: Docker@0
displayName: Build
@@ -37,10 +37,10 @@ phases:
containerCommand: '/src/ci/test.sh'
detached: false
-- phase: linux_trusty_clang_openssl
+- job: linux_trusty_clang_openssl
displayName: 'Linux (Trusty; Clang; OpenSSL)'
- queue:
- name: 'Hosted Linux Preview'
+ pool:
+ vmImage: 'Ubuntu 16.04'
steps:
- task: Docker@0
displayName: Build
@@ -68,10 +68,10 @@ phases:
containerCommand: '/src/ci/test.sh'
detached: false
-- phase: macos
+- job: macos
displayName: 'macOS'
- queue:
- name: 'Hosted macOS Preview'
+ pool:
+ vmImage: 'macOS 10.13'
steps:
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
displayName: Setup
@@ -85,10 +85,9 @@ phases:
TMPDIR: $(Agent.TempDirectory)
LEAK_CHECK: leaks
-- phase: windows_vs_amd64
+- job: windows_vs_amd64
displayName: 'Windows (Visual Studio; amd64)'
- queue:
- name: Hosted
+ pool: Hosted
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
displayName: Build
@@ -97,10 +96,9 @@ phases:
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
displayName: Test
-- phase: windows_vs_x86
+- job: windows_vs_x86
displayName: 'Windows (Visual Studio; x86)'
- queue:
- name: Hosted
+ pool: Hosted
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
displayName: Build
@@ -109,10 +107,9 @@ phases:
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
displayName: Test
-- phase: windows_mingw_amd64
+- job: windows_mingw_amd64
displayName: 'Windows (MinGW; amd64)'
- queue:
- name: Hosted
+ pool: Hosted
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
displayName: Setup
@@ -127,10 +124,9 @@ phases:
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
displayName: Test
-- phase: windows_mingw_x86
+- job: windows_mingw_x86
displayName: 'Windows (MinGW; x86)'
- queue:
- name: Hosted
+ pool: Hosted
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
displayName: Setup