Skip to content

Commit 6d9b1f0

Browse files
authored
Merge pull request libgit2#4791 from DavidStaheli/users/davidstaheli/vsts-yaml
Update VSTS YAML files with the latest syntax
2 parents 7edc1c8 + 7238a1e commit 6d9b1f0

File tree

2 files changed

+28
-32
lines changed

2 files changed

+28
-32
lines changed

.vsts-ci.yml

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ trigger:
55
- master
66
- maint/*
77

8-
phases:
9-
- phase: linux_trusty_gcc_openssl
8+
jobs:
9+
- job: linux_trusty_gcc_openssl
1010
displayName: 'Linux (Trusty; GCC; OpenSSL)'
11-
queue:
12-
name: 'Hosted Linux Preview'
11+
pool:
12+
vmImage: 'Ubuntu 16.04'
1313
steps:
1414
- task: Docker@0
1515
displayName: Build
@@ -37,10 +37,10 @@ phases:
3737
containerCommand: '/src/ci/test.sh'
3838
detached: false
3939

40-
- phase: linux_trusty_gcc_mbedtls
40+
- job: linux_trusty_gcc_mbedtls
4141
displayName: 'Linux (Trusty; GCC; mbedTLS)'
42-
queue:
43-
name: 'Hosted Linux Preview'
42+
pool:
43+
vmImage: 'Ubuntu 16.04'
4444
steps:
4545
- task: Docker@0
4646
displayName: Build
@@ -70,10 +70,10 @@ phases:
7070
containerCommand: '/src/ci/test.sh'
7171
detached: false
7272

73-
- phase: linux_trusty_clang_openssl
73+
- job: linux_trusty_clang_openssl
7474
displayName: 'Linux (Trusty; Clang; OpenSSL)'
75-
queue:
76-
name: 'Hosted Linux Preview'
75+
pool:
76+
vmImage: 'Ubuntu 16.04'
7777
steps:
7878
- task: Docker@0
7979
displayName: Build
@@ -101,10 +101,10 @@ phases:
101101
containerCommand: '/src/ci/test.sh'
102102
detached: false
103103

104-
- phase: linux_trusty_clang_mbedtls
104+
- job: linux_trusty_clang_mbedtls
105105
displayName: 'Linux (Trusty; Clang; mbedTLS)'
106-
queue:
107-
name: 'Hosted Linux Preview'
106+
pool:
107+
vmImage: 'Ubuntu 16.04'
108108
steps:
109109
- task: Docker@0
110110
displayName: Build
@@ -134,10 +134,10 @@ phases:
134134
containerCommand: '/src/ci/test.sh'
135135
detached: false
136136

137-
- phase: macos
137+
- job: macos
138138
displayName: 'macOS'
139-
queue:
140-
name: 'Hosted macOS Preview'
139+
pool:
140+
vmImage: 'macOS 10.13'
141141
steps:
142142
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
143143
displayName: Setup
@@ -151,10 +151,9 @@ phases:
151151
TMPDIR: $(Agent.TempDirectory)
152152
LEAK_CHECK: leaks
153153

154-
- phase: windows_vs_amd64
154+
- job: windows_vs_amd64
155155
displayName: 'Windows (Visual Studio; amd64)'
156-
queue:
157-
name: Hosted
156+
pool: Hosted
158157
steps:
159158
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
160159
displayName: Build
@@ -163,10 +162,9 @@ phases:
163162
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
164163
displayName: Test
165164

166-
- phase: windows_vs_x86
165+
- job: windows_vs_x86
167166
displayName: 'Windows (Visual Studio; x86)'
168-
queue:
169-
name: Hosted
167+
pool: Hosted
170168
steps:
171169
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
172170
displayName: Build
@@ -175,10 +173,9 @@ phases:
175173
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
176174
displayName: Test
177175

178-
- phase: windows_mingw_amd64
176+
- job: windows_mingw_amd64
179177
displayName: 'Windows (MinGW; amd64)'
180-
queue:
181-
name: Hosted
178+
pool: Hosted
182179
steps:
183180
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
184181
displayName: Setup
@@ -193,10 +190,9 @@ phases:
193190
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
194191
displayName: Test
195192

196-
- phase: windows_mingw_x86
193+
- job: windows_mingw_x86
197194
displayName: 'Windows (MinGW; x86)'
198-
queue:
199-
name: Hosted
195+
pool: Hosted
200196
steps:
201197
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
202198
displayName: Setup

.vsts-nightly.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
resources:
22
- repo: self
33

4-
phases:
5-
- phase: coverity
4+
jobs:
5+
- job: coverity
66
displayName: 'Coverity'
7-
queue:
8-
name: 'Hosted Linux Preview'
7+
pool:
8+
vmImage: 'Ubuntu 16.04'
99
steps:
1010
- task: Docker@0
1111
displayName: Build

0 commit comments

Comments
 (0)