Commit 28f05585 by Edward Thomson

ci: reorganize naming for consistency

parent 4ec597dc
...@@ -6,8 +6,8 @@ trigger: ...@@ -6,8 +6,8 @@ trigger:
- maint/* - maint/*
jobs: jobs:
- job: linux_trusty_gcc_openssl - job: linux_amd64_trusty_gcc_openssl
displayName: 'Linux (Trusty; GCC; OpenSSL)' displayName: 'Linux (amd64; Trusty; GCC; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'Ubuntu 16.04'
steps: steps:
...@@ -19,8 +19,8 @@ jobs: ...@@ -19,8 +19,8 @@ jobs:
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL
LEAK_CHECK=valgrind LEAK_CHECK=valgrind
- job: linux_trusty_gcc_mbedtls - job: linux_amd64_trusty_gcc_mbedtls
displayName: 'Linux (Trusty; GCC; mbedTLS)' displayName: 'Linux (amd64; Trusty; GCC; mbedTLS)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'Ubuntu 16.04'
steps: steps:
...@@ -32,8 +32,8 @@ jobs: ...@@ -32,8 +32,8 @@ jobs:
CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DSHA1_BACKEND=mbedTLS CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DSHA1_BACKEND=mbedTLS
LEAK_CHECK=valgrind LEAK_CHECK=valgrind
- job: linux_trusty_clang_openssl - job: linux_amd64_trusty_clang_openssl
displayName: 'Linux (Trusty; Clang; OpenSSL)' displayName: 'Linux (amd64; Trusty; Clang; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'Ubuntu 16.04'
steps: steps:
...@@ -45,8 +45,8 @@ jobs: ...@@ -45,8 +45,8 @@ jobs:
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL
LEAK_CHECK=valgrind LEAK_CHECK=valgrind
- job: linux_trusty_clang_mbedtls - job: linux_amd64_trusty_clang_mbedtls
displayName: 'Linux (Trusty; Clang; mbedTLS)' displayName: 'Linux (amd64; Trusty; Clang; mbedTLS)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'Ubuntu 16.04'
steps: steps:
...@@ -74,7 +74,7 @@ jobs: ...@@ -74,7 +74,7 @@ jobs:
CMAKE_OPTIONS: -G Ninja CMAKE_OPTIONS: -G Ninja
- job: windows_vs_amd64 - job: windows_vs_amd64
displayName: 'Windows (Visual Studio; amd64)' displayName: 'Windows (amd64; Visual Studio)'
pool: Hosted pool: Hosted
steps: steps:
- template: azure-pipelines/powershell.yml - template: azure-pipelines/powershell.yml
...@@ -83,7 +83,7 @@ jobs: ...@@ -83,7 +83,7 @@ jobs:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64" CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64"
- job: windows_vs_x86 - job: windows_vs_x86
displayName: 'Windows (Visual Studio; x86)' displayName: 'Windows (x86; Visual Studio)'
pool: Hosted pool: Hosted
steps: steps:
- template: azure-pipelines/powershell.yml - template: azure-pipelines/powershell.yml
...@@ -92,7 +92,7 @@ jobs: ...@@ -92,7 +92,7 @@ jobs:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013"
- job: windows_mingw_amd64 - job: windows_mingw_amd64
displayName: 'Windows (MinGW; amd64)' displayName: 'Windows (amd64; MinGW)'
pool: Hosted pool: Hosted
steps: steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
...@@ -107,7 +107,7 @@ jobs: ...@@ -107,7 +107,7 @@ jobs:
PATH: $(Agent.TempDirectory)\mingw64\bin;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\CMake\bin PATH: $(Agent.TempDirectory)\mingw64\bin;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\CMake\bin
- job: windows_mingw_x86 - job: windows_mingw_x86
displayName: 'Windows (MinGW; x86)' displayName: 'Windows (x86; MinGW)'
pool: Hosted pool: Hosted
steps: steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment