diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-09-02 18:00:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-02 18:00:05 +0100 |
| commit | 6d9b1f08f6f5e7253a56cc73495a1b3ec2e37c21 (patch) | |
| tree | 1765af058d03571576e0f0c3cf4334ef24ad8641 | |
| parent | 7edc1c870e34647a5fad0f243331d0385b2cab5d (diff) | |
| parent | 7238a1e8c7e6b48439ce553c99b83915cb33b394 (diff) | |
| download | libgit2-6d9b1f08f6f5e7253a56cc73495a1b3ec2e37c21.tar.gz | |
Merge pull request #4791 from DavidStaheli/users/davidstaheli/vsts-yaml
Update VSTS YAML files with the latest syntax
| -rw-r--r-- | .vsts-ci.yml | 52 | ||||
| -rw-r--r-- | .vsts-nightly.yml | 8 |
2 files changed, 28 insertions, 32 deletions
diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 683385be2..c08a9b6ba 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 6c5d0ebb4..4d6d8a3e8 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 |