diff options
| -rw-r--r-- | azure-pipelines.yml | 15 | ||||
| -rw-r--r-- | ci/azure-steps.yml | 25 |
2 files changed, 13 insertions, 27 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 252213b..2696fc1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,6 +17,7 @@ trigger: - 'run_tests.py' - 'run_unittests.py' pr: + autoCancel: true branches: include: - '*' @@ -64,7 +65,12 @@ jobs: versionSpec: '3.6' addToPath: true 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 timeoutInMinutes: 120 @@ -93,4 +99,9 @@ jobs: versionSpec: '3.7' addToPath: true architecture: 'x64' - - template: ci/azure-steps.yml + - task: PowerShell@2 + inputs: + targetType: 'filePath' + filePath: .\ci\run.ps1 + env: + MESON_CI_JOBNAME: azure-$(System.JobName) diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml deleted file mode 100644 index 8aba224..0000000 --- a/ci/azure-steps.yml +++ /dev/null @@ -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()) |