Commit 6d9b1f08f6f5e7253a56cc73495a1b3ec2e37c21
2018-09-02T18:00:05
Merge pull request #4791 from DavidStaheli/users/davidstaheli/vsts-yaml Update VSTS YAML files with the latest syntax
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 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 683385b..c08a9b6 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_gcc_mbedtls
+- job: linux_trusty_gcc_mbedtls
displayName: 'Linux (Trusty; GCC; mbedTLS)'
- queue:
- name: 'Hosted Linux Preview'
+ pool:
+ vmImage: 'Ubuntu 16.04'
steps:
- task: Docker@0
displayName: Build
@@ -70,10 +70,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
@@ -101,10 +101,10 @@ phases:
containerCommand: '/src/ci/test.sh'
detached: false
-- phase: linux_trusty_clang_mbedtls
+- job: linux_trusty_clang_mbedtls
displayName: 'Linux (Trusty; Clang; mbedTLS)'
- queue:
- name: 'Hosted Linux Preview'
+ pool:
+ vmImage: 'Ubuntu 16.04'
steps:
- task: Docker@0
displayName: Build
@@ -134,10 +134,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
@@ -151,10 +151,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
@@ -163,10 +162,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
@@ -175,10 +173,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
@@ -193,10 +190,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
diff --git a/.vsts-nightly.yml b/.vsts-nightly.yml
index 6c5d0eb..4d6d8a3 100644
--- a/.vsts-nightly.yml
+++ b/.vsts-nightly.yml
@@ -1,11 +1,11 @@
resources:
- repo: self
-phases:
-- phase: coverity
+jobs:
+- job: coverity
displayName: 'Coverity'
- queue:
- name: 'Hosted Linux Preview'
+ pool:
+ vmImage: 'Ubuntu 16.04'
steps:
- task: Docker@0
displayName: Build