1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-09-18 01:33:00 +03:00

Merge PR #1179: Azure Pipelines: add Windows 32 bit build, templatize Windows steps

This commit is contained in:
Davide Beatrici 2020-07-21 22:32:28 +02:00 committed by GitHub
commit 3c99f64621
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 19 deletions

View File

@ -0,0 +1,24 @@
parameters:
- name: bits
type: string
steps:
- script: |
cd /d $(Build.BinariesDirectory)
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars${{parameters.bits}}.bat"
cmake -G "Ninja" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER=cl "-DCMAKE_CXX_COMPILER=cl" $(Build.SourcesDirectory)
cmake --build .
displayName: 'Build'
- powershell: |
. .ci\appveyor-vpntest.ps1
displayName: 'Test'
- task: CopyFiles@2
inputs:
sourceFolder: '$(Build.BinariesDirectory)'
contents: '?(*.exe|*.se2|*.pdb)'
TargetFolder: '$(Build.StagingDirectory)'
flattenFolders: true
- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: '$(Build.StagingDirectory)'
artifactName: 'Binaries'

View File

@ -4,22 +4,14 @@ jobs:
pool:
vmImage: vs2017-win2016
steps:
- script: |
cd /d %BUILD_BINARIESDIRECTORY%
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
cmake -G "Ninja" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER=cl "-DCMAKE_CXX_COMPILER=cl" %BUILD_SOURCESDIRECTORY%
cmake --build .
displayName: 'Build'
- powershell: |
. .ci\appveyor-vpntest.ps1
displayName: 'Test'
- task: CopyFiles@2
inputs:
sourceFolder: '$(Build.BinariesDirectory)'
contents: '?(*.exe|*.se2|*.pdb)'
TargetFolder: '$(Build.StagingDirectory)'
flattenFolders: true
- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: '$(Build.StagingDirectory)'
artifactName: 'Binaries'
- template: "azure-pipelines-win-steps.yml"
parameters:
bits: "64"
- job: windows_x86
displayName: 'Windows (x86)'
pool:
vmImage: vs2017-win2016
steps:
- template: "azure-pipelines-win-steps.yml"
parameters:
bits: "32"