Azure CI: Reduce YAML redundancy

This commit is contained in:
Martin Kinkelin 2020-09-25 16:38:41 +02:00
parent 7b60e270bf
commit 38e3d26149
3 changed files with 28 additions and 84 deletions

View file

@ -9,6 +9,7 @@ steps:
- script: | - script: |
bash --version bash --version
sh --login .azure-pipelines/windows-visual-studio.sh sh --login .azure-pipelines/windows-visual-studio.sh
displayName: Download requires binaries displayName: Download required binaries
- script: | - script: |
call .azure-pipelines/windows-msbuild.bat call .azure-pipelines/windows-msbuild.bat
displayName: Build and test

View file

@ -13,4 +13,4 @@ steps:
FOR /F "tokens=* USEBACKQ" %%F IN (`where lib.exe`) DO (SET MSVC_AR=%%~fsF) FOR /F "tokens=* USEBACKQ" %%F IN (`where lib.exe`) DO (SET MSVC_AR=%%~fsF)
bash --version bash --version
sh --login .azure-pipelines/windows.sh sh --login .azure-pipelines/windows.sh
displayName: Build DMD displayName: Build and test

View file

@ -1,11 +1,14 @@
# Learn more: https://aka.ms/yaml # Learn more: https://aka.ms/yaml
variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
jobs: jobs:
- job: Windows_Bootstrap - job: Windows_DMD_bootstrap
timeoutInMinutes: 120 timeoutInMinutes: 120
pool: pool:
vmImage: 'vs2017-win2016' vmImage: 'vs2017-win2016'
variables: variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\ D_COMPILER: dmd
HOST_DMD_VERSION: 2.079.0 HOST_DMD_VERSION: 2.079.0
strategy: strategy:
matrix: matrix:
@ -13,16 +16,19 @@ jobs:
OS: Win_64 OS: Win_64
MODEL: 64 MODEL: 64
ARCH: x64 ARCH: x64
D_COMPILER: dmd x86-OMF:
OS: Win_32
MODEL: 32
ARCH: x86
steps: steps:
- template: .azure-pipelines/windows.yml - template: .azure-pipelines/windows.yml
- job: Windows - job: Windows_DMD_latest
timeoutInMinutes: 120 timeoutInMinutes: 120
pool: pool:
vmImage: 'vs2017-win2016' vmImage: 'vs2017-win2016'
variables: variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\ D_COMPILER: dmd
HOST_DMD_VERSION: LATEST HOST_DMD_VERSION: LATEST
strategy: strategy:
matrix: matrix:
@ -30,101 +36,38 @@ jobs:
OS: Win_64 OS: Win_64
MODEL: 64 MODEL: 64
ARCH: x64 ARCH: x64
D_COMPILER: dmd x86-OMF:
OS: Win_32
MODEL: 32
ARCH: x86
steps: steps:
- template: .azure-pipelines/windows.yml - template: .azure-pipelines/windows.yml
- template: .azure-pipelines/windows-artifact.yml - template: .azure-pipelines/windows-artifact.yml
- job: Windows_OMF_Bootstrap - job: Windows_VisualD_LDC
timeoutInMinutes: 120 timeoutInMinutes: 120
pool: pool:
vmImage: 'vs2017-win2016' vmImage: 'vs2017-win2016'
variables: variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
HOST_DMD_VERSION: 2.079.0
strategy:
matrix:
win32:
OS: Win_32
MODEL: 32
ARCH: x86
D_COMPILER: dmd
steps:
- template: .azure-pipelines/windows.yml
- job: Windows_OMF
timeoutInMinutes: 120
pool:
vmImage: 'vs2017-win2016'
variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
HOST_DMD_VERSION: LATEST
strategy:
matrix:
win32:
OS: Win_32
MODEL: 32
ARCH: x86
D_COMPILER: dmd
steps:
- template: .azure-pipelines/windows.yml
- template: .azure-pipelines/windows-artifact.yml
- job: Windows_VisualD
timeoutInMinutes: 120
pool:
vmImage: 'vs2017-win2016'
variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
HOST_DMD_VERSION: 2.090.0 HOST_DMD_VERSION: 2.090.0
strategy:
matrix:
win32-ldc:
OS: Win_32
MODEL: 32
ARCH: x86
D_COMPILER: ldc D_COMPILER: ldc
VISUALD_VER: v0.49.0 VISUALD_VER: v0.49.0
LDC_VERSION: 1.20.0 LDC_VERSION: 1.20.0
steps:
- template: .azure-pipelines/windows-visual-studio.yml
- job: Windows_LDC_Debug
timeoutInMinutes: 120
pool:
vmImage: 'vs2017-win2016'
variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
HOST_DMD_VERSION: 2.090.0
strategy: strategy:
matrix: matrix:
x64-debug-ldc: x64_Debug:
OS: Win_64 OS: Win_64
MODEL: 64 MODEL: 64
ARCH: x64 ARCH: x64
CONFIGURATION: Debug CONFIGURATION: Debug
D_COMPILER: ldc x86-mscoff:
VISUALD_VER: v0.49.0 OS: Win_32
LDC_VERSION: 1.20.0 MODEL: 32mscoff
steps: ARCH: x86
- template: .azure-pipelines/windows-visual-studio.yml x86-mscoff_MinGW:
- job: Windows_LDC_MinGW
timeoutInMinutes: 120
pool:
vmImage: 'vs2017-win2016'
variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
HOST_DMD_VERSION: 2.090.0
strategy:
matrix:
win32-ldc:
OS: Win_32 OS: Win_32
MODEL: 32mscoff MODEL: 32mscoff
ARCH: x86 ARCH: x86
D_COMPILER: ldc
C_RUNTIME: mingw C_RUNTIME: mingw
VISUALD_VER: v0.49.0
LDC_VERSION: 1.20.0
steps: steps:
- template: .azure-pipelines/windows-visual-studio.yml - template: .azure-pipelines/windows-visual-studio.yml