Skip to content

Commit ca56369

Browse files
Always bootstrap vcpkg (#27)
1 parent dcb0c67 commit ca56369

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

azure-pipelines.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,10 @@ stages:
3434
useCppRestSDK: true
3535
cMakeRunArgs: '-A x64'
3636
beforeBuild:
37-
# check if vcpkg exists on the machine before trying to build it
38-
- powershell: |
39-
if ((Get-Command vcpkg.exe -ErrorAction SilentlyContinue) -eq $null) {
40-
& ./submodules/vcpkg/bootstrap-vcpkg.bat
41-
}
37+
- powershell: "& ./submodules/vcpkg/bootstrap-vcpkg.bat"
4238
condition: ne(variables.CACHE_RESTORED, 'true')
4339
displayName: Bootstrap vcpkg
44-
- powershell: |
45-
if (Get-Command vcpkg.exe -ErrorAction SilentlyContinue) {
46-
& vcpkg.exe install cpprestsdk:x64-windows --vcpkg-root ./submodules/vcpkg
47-
} else {
48-
& ./submodules/vcpkg/vcpkg.exe install cpprestsdk:x64-windows --vcpkg-root ./submodules/vcpkg
49-
}
40+
- powershell: "& ./submodules/vcpkg/vcpkg.exe install cpprestsdk:x64-windows --vcpkg-root ./submodules/vcpkg"
5041
condition: ne(variables.CACHE_RESTORED, 'true')
5142
displayName: vcpkg install dependencies
5243
afterBuild:
@@ -80,7 +71,10 @@ stages:
8071
jobName: Linux_Build_Test_With_CppRestSDK
8172
useCppRestSDK: true
8273
beforeBuild:
83-
- script: sudo vcpkg install cpprestsdk boost-system boost-chrono boost-thread --vcpkg-root ./submodules/vcpkg
74+
- bash: "./submodules/vcpkg/bootstrap-vcpkg.sh"
75+
condition: ne(variables.CACHE_RESTORED, 'true')
76+
displayName: Bootstrap vcpkg
77+
- bash: "./submodules/vcpkg/vcpkg install cpprestsdk boost-system boost-chrono boost-thread --vcpkg-root ./submodules/vcpkg"
8478
condition: ne(variables.CACHE_RESTORED, 'true')
8579
displayName: vcpkg install dependencies
8680

0 commit comments

Comments
 (0)