mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Azure: Update Windows builds to use VS 2019 and Qt 5.15.2

Browse Source 
Qt 5.15.2 and VS 2019 support all Windows platforms still supported
by YACReader. Update the build to take advantage of it.
This commit is contained in:
Felix Kauselmann 2021-03-14 14:56:17 +01:00
parent 84c43e456e
commit 2e0785e3a5
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
azure-pipelines-windows-template.yml
View File

@ -1,10 +1,10 @@
parameters: parameters:
name: Windows_x64 name: Windows_x64
architecture: 'x64' architecture: 'x64'
qt_version: '5.12.6' qt_version: '5.15.2'
qt_spec: 'msvc2017_64' qt_spec: 'msvc2019_64'
qt_aqt_spec: 'win64_msvc2017_64' qt_aqt_spec: 'win64_msvc2019_64'
vc_redist_url: 'https://go.microsoft.com/fwlink/?LinkId=746572' vc_redist_url: 'https://aka.ms/vs/16/release/vc_redist.x64.exe'
vc_redist_file_name: 'vc_redist.x64.exe' vc_redist_file_name: 'vc_redist.x64.exe'
vc_vars: 'vcvars64.bat' vc_vars: 'vcvars64.bat'
@ -12,7 +12,7 @@ jobs:
- job: ${{ parameters.name }} - job: ${{ parameters.name }}
dependsOn: CodeFormatValidation dependsOn: CodeFormatValidation
pool: pool:
vmImage: 'vs2017-win2016' vmImage: 'windows-2019'
steps: steps:
- script: | - script: |
pip install aqtinstall pip install aqtinstall
@ -26,7 +26,7 @@ jobs:
wget "${{ parameters.vc_redist_url }}" -O $(Build.SourcesDirectory)\${{ parameters.vc_redist_file_name }} wget "${{ parameters.vc_redist_url }}" -O $(Build.SourcesDirectory)\${{ parameters.vc_redist_file_name }}
displayName: 'Install dependencies' displayName: 'Install dependencies'
- script: | - script: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\${{ parameters.vc_vars }}" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\${{ parameters.vc_vars }}"
set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH% set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
set DEFINES_VAR=DEFINES+="BUILD_NUMBER=\\\\\\\"$(Build.BuildNumber)\\\\\\\"" set DEFINES_VAR=DEFINES+="BUILD_NUMBER=\\\\\\\"$(Build.BuildNumber)\\\\\\\""
qmake CONFIG+="7zip" %DEFINES_VAR% qmake CONFIG+="7zip" %DEFINES_VAR%

16
azure-pipelines.yml
View File

@ -103,20 +103,20 @@ jobs:
parameters: parameters:
name: Windows_x64 name: Windows_x64
architecture: 'x64' architecture: 'x64'
qt_version: '5.12.6' qt_version: '5.15.2'
qt_spec: 'msvc2017_64' qt_spec: 'msvc2019_64'
qt_aqt_spec: 'win64_msvc2017_64' qt_aqt_spec: 'win64_msvc2019_64'
vc_redist_url: 'https://go.microsoft.com/fwlink/?LinkId=746572' vc_redist_url: 'https://aka.ms/vs/16/release/vc_redist.x64.exe'
vc_redist_file_name: 'vc_redist.x64.exe' vc_redist_file_name: 'vc_redist.x64.exe'
vc_vars: 'vcvars64.bat' vc_vars: 'vcvars64.bat'
- template: azure-pipelines-windows-template.yml - template: azure-pipelines-windows-template.yml
parameters: parameters:
name: Windows_x86 name: Windows_x86
architecture: 'x86' architecture: 'x86'
qt_version: '5.12.6' qt_version: '5.15.2'
qt_spec: 'msvc2017' qt_spec: 'msvc2019'
qt_aqt_spec: 'win32_msvc2017' qt_aqt_spec: 'win32_msvc2019'
vc_redist_url: 'https://go.microsoft.com/fwlink/?LinkId=746571' vc_redist_url: 'https://aka.ms/vs/16/release/vc_redist.x86.exe'
vc_redist_file_name: 'vc_redist.x86.exe' vc_redist_file_name: 'vc_redist.x86.exe'
vc_vars: 'vcvars32.bat' vc_vars: 'vcvars32.bat'