From be3bd9ea64570a468d482a8fc70e3d8474f77286 Mon Sep 17 00:00:00 2001
From: Daniel Mensinger <daniel@mensinger-ka.de>
Date: Fri, 3 Sep 2021 21:24:27 +0200
Subject: [PATCH] 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.
---
 azure-pipelines.yml | 15 +++++++++++++--
 ci/azure-steps.yml  | 25 -------------------------
 2 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 ci/azure-steps.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 252213bf6..2696fc17c 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 8aba2242d..000000000
--- 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())