summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2018-10-12 12:08:00 +0200
committerPatrick Steinhardt <ps@pks.im>2018-10-19 13:47:20 +0200
commit9a3fc39f5673271c295e469f6b6455379ca63c73 (patch)
treec2a666e8c575e80810060c427b666c6257299b6b
parent2e7ff77ff7ecc83f5126ee60bdf9b3d99a3e8e60 (diff)
downloadlibgit2-9a3fc39f5673271c295e469f6b6455379ca63c73.tar.gz
Update .vsts-ci.yml
(cherry picked from commit 7238a1e8c7e6b48439ce553c99b83915cb33b394)
-rw-r--r--.vsts-ci.yml40
1 files changed, 18 insertions, 22 deletions
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 36ce77760..be8cdb344 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