Skip to content

Commit 62ad9a8

Browse files
Update Mac machine to 10.15 (#58)
1 parent 5b030ea commit 62ad9a8

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.azure/default-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
enableTelemetry: true
2525
pool:
2626
${{ if eq(parameters.agentOs, 'macOS') }}:
27-
vmImage: macOS-10.14
27+
vmImage: macOS-10.15
2828
${{ if eq(parameters.agentOs, 'Linux') }}:
2929
vmImage: ubuntu-16.04
3030
${{ if eq(parameters.agentOs, 'Windows') }}:
@@ -40,9 +40,9 @@ jobs:
4040
cacheHitVar: CACHE_RESTORED
4141
displayName: Cache vcpkg packages
4242
condition: eq( '${{ parameters.useCppRestSDK }}', 'true' )
43-
43+
4444
- ${{ parameters.beforeBuild }}
45-
45+
4646
- task: CMake@1
4747
inputs:
4848
cmakeArgs: .. ${{ parameters.cMakeRunArgs }} -DCMAKE_TOOLCHAIN_FILE=../submodules/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=${{ parameters.configuration }} -DUSE_CPPRESTSDK=${{ parameters.useCppRestSDK }}
@@ -67,7 +67,7 @@ jobs:
6767
displayName: Run tests
6868

6969
- ${{ parameters.afterBuild }}
70-
70+
7171
- task: PublishTestResults@2
7272
displayName: Publish test results
7373
condition: always()

azure-pipelines.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ stages:
4747
jobName: Mac_Build_Test_With_CppRestSDK
4848
useCppRestSDK: true
4949
beforeBuild:
50-
- script: brew install gcc
51-
displayName: Install gcc
52-
- bash: "./submodules/vcpkg/bootstrap-vcpkg.sh"
50+
- bash: "./submodules/vcpkg/bootstrap-vcpkg.sh --allowAppleClang"
5351
condition: ne(variables.CACHE_RESTORED, 'true')
5452
displayName: Bootstrap vcpkg
5553
- bash: "./submodules/vcpkg/vcpkg install cpprestsdk"
@@ -68,7 +66,7 @@ stages:
6866
- bash: "./submodules/vcpkg/vcpkg install cpprestsdk boost-system boost-chrono boost-thread --vcpkg-root ./submodules/vcpkg"
6967
condition: ne(variables.CACHE_RESTORED, 'true')
7068
displayName: vcpkg install dependencies
71-
- bash: "sudo apt install valgrind"
69+
- bash: "sudo apt-get update && sudo apt install valgrind"
7270
displayName: install valgrind
7371

7472
- template: .azure/default-build.yml
@@ -77,7 +75,7 @@ stages:
7775
jobName: Linux_Build_Test
7876
useCppRestSDK: false
7977
beforeBuild:
80-
- bash: "sudo apt install valgrind"
78+
- bash: "sudo apt-get update && sudo apt install valgrind"
8179
displayName: install valgrind
8280

8381
- template: .azure/default-build.yml

0 commit comments

Comments
 (0)