Skip to content

C
cpython
Commit 801f9259 authored by Steve Dower's avatar Steve Dower Committed by Zachary Ware
Browse files
Options

bpo-38089: Move Azure Pipelines to latest VM versions and make macOS tests optional (GH-15851)

parent 7d952ded
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
.azure-pipelines/ci.yml
View file @ 801f9259
...@@ -42,7 +42,7 @@ jobs: ...@@ -42,7 +42,7 @@ jobs:
testRunPlatform: macos testRunPlatform: macos
pool: pool:
vmImage: xcode9-macos10.13 vmImage: macos-10.14
steps: steps:
- template: ./macos-steps.yml - template: ./macos-steps.yml
...@@ -131,7 +131,7 @@ jobs: ...@@ -131,7 +131,7 @@ jobs:
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true')) condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
pool: pool:
vmImage: vs2017-win2016 vmImage: windows-2019
strategy: strategy:
matrix: matrix:
......
.azure-pipelines/macos-steps.yml
View file @ 801f9259
...@@ -14,6 +14,8 @@ steps: ...@@ -14,6 +14,8 @@ steps:
- script: make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml" - script: make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
displayName: 'Tests' displayName: 'Tests'
continueOnError: true
timeoutInMinutes: 30
- task: PublishTestResults@2 - task: PublishTestResults@2
displayName: 'Publish Test Results' displayName: 'Publish Test Results'
......
.azure-pipelines/pr.yml
View file @ 801f9259
...@@ -40,7 +40,7 @@ jobs: ...@@ -40,7 +40,7 @@ jobs:
testRunPlatform: macos testRunPlatform: macos
pool: pool:
vmImage: xcode9-macos10.13 vmImage: macos-10.14
steps: steps:
- template: ./macos-steps.yml - template: ./macos-steps.yml
...@@ -131,7 +131,7 @@ jobs: ...@@ -131,7 +131,7 @@ jobs:
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true')) condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
pool: pool:
vmImage: vs2017-win2016 vmImage: windows-2019
strategy: strategy:
matrix: matrix:
......
Misc/NEWS.d/next/macOS/2019-09-10-14-24-35.bpo-38089.eedgyD.rst 0 → 100644
View file @ 801f9259
Move Azure Pipelines to latest VM versions and make macOS tests optional
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7