Merge PR #5210: CI: Update to latest vcpkg environment

This commit is contained in:
Davide Beatrici 2021-07-28 08:51:26 +02:00 committed by GitHub
commit 4e75b8efb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions

View File

@ -22,10 +22,10 @@ environment:
matrix:
- MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md'
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.4.x~2021-04-26~7da4529f.x64'
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.5.x~2021-07-27~64f88807.x64'
VCVARS_PATH: 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvars64.bat'
- MUMBLE_ENVIRONMENT_TRIPLET: 'x86-windows-static-md'
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.4.x~2021-04-26~7da4529f.x86'
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.5.x~2021-07-27~64f88807.x86'
VCVARS_PATH: 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsamd64_x86.bat'
install:

View File

@ -24,7 +24,7 @@ jobs:
pool:
vmImage: 'windows-latest'
variables:
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.4.x~2021-04-26~7da4529f.x64'
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.5.x~2021-07-27~64f88807.x64'
MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md'
VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat'
steps:
@ -39,7 +39,7 @@ jobs:
pool:
vmImage: 'windows-latest'
variables:
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.4.x~2021-04-26~7da4529f.x86'
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.5.x~2021-07-27~64f88807.x86'
MUMBLE_ENVIRONMENT_TRIPLET: 'x86-windows-static-md'
VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsamd64_x86.bat'
steps:
@ -61,7 +61,7 @@ jobs:
pool:
vmImage: 'macOS-latest'
variables:
MUMBLE_ENVIRONMENT_VERSION: 'macos-static-1.4.x~2021-04-26~7da4529f.x64'
MUMBLE_ENVIRONMENT_VERSION: 'macos-static-1.5.x~2021-07-27~64f88807.x64'
steps:
- template: steps_macos.yml
parameters:

View File

@ -22,7 +22,7 @@ jobs:
pool:
vmImage: 'windows-latest'
variables:
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.4.x~2021-04-26~7da4529f.x64'
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.5.x~2021-07-27~64f88807.x64'
MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md'
VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat'
steps:
@ -37,7 +37,7 @@ jobs:
pool:
vmImage: 'windows-latest'
variables:
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.4.x~2021-04-26~7da4529f.x86'
MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.5.x~2021-07-27~64f88807.x86'
MUMBLE_ENVIRONMENT_TRIPLET: 'x86-windows-static-md'
VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsamd64_x86.bat'
steps:
@ -62,6 +62,6 @@ jobs:
- agent.os -equals Darwin
variables:
MUMBLE_ENVIRONMENT_STORE: '~/MumbleBuild'
MUMBLE_ENVIRONMENT_VERSION: 'latest-1.4.x'
MUMBLE_ENVIRONMENT_VERSION: 'latest-1.5.x'
steps:
- template: steps_macos.yml