ci: Also use the `autoCancel` key for Azure

This also removes the additional upload step for test results
in the hope of fixing the `autoCancel` flag.
pull/9222/head
Daniel Mensinger 3 years ago
parent d5f30308b4
commit be3bd9ea64
  1. 15
      azure-pipelines.yml
  2. 25
      ci/azure-steps.yml

@ -17,6 +17,7 @@ trigger:
- 'run_tests.py' - 'run_tests.py'
- 'run_unittests.py' - 'run_unittests.py'
pr: pr:
autoCancel: true
branches: branches:
include: include:
- '*' - '*'
@ -64,7 +65,12 @@ jobs:
versionSpec: '3.6' versionSpec: '3.6'
addToPath: true addToPath: true
architecture: 'x64' architecture: 'x64'
- template: ci/azure-steps.yml - task: PowerShell@2
inputs:
targetType: 'filePath'
filePath: .\ci\run.ps1
env:
MESON_CI_JOBNAME: azure-$(System.JobName)
- job: vs2019 - job: vs2019
timeoutInMinutes: 120 timeoutInMinutes: 120
@ -93,4 +99,9 @@ jobs:
versionSpec: '3.7' versionSpec: '3.7'
addToPath: true addToPath: true
architecture: 'x64' architecture: 'x64'
- template: ci/azure-steps.yml - task: PowerShell@2
inputs:
targetType: 'filePath'
filePath: .\ci\run.ps1
env:
MESON_CI_JOBNAME: azure-$(System.JobName)

@ -1,25 +0,0 @@
steps:
- task: PowerShell@2
inputs:
targetType: 'filePath'
filePath: .\ci\run.ps1
env:
MESON_CI_JOBNAME: azure-$(System.JobName)
- task: PublishTestResults@2
inputs:
testResultsFiles: meson-test-run.xml
testRunTitle: $(System.JobName)
publishRunAttachments: true
condition: not(canceled())
- task: CopyFiles@2
inputs:
contents: 'meson-test-run.*'
targetFolder: $(Build.ArtifactStagingDirectory)
condition: not(canceled())
- task: PublishBuildArtifacts@1
inputs:
artifactName: $(System.JobName)
condition: not(canceled())
Loading…
Cancel
Save