ci: use consistent python for all jobs

Signed-off-by: Ran Benita <ran@unusedvar.com>

diff --git a/.azure-pipelines/steps/dependencies-linux.yml b/.azure-pipelines/steps/dependencies-linux.yml
index 6d6bcceac3f14c8252f1368d4b78ef928111f6e0..a444807c540f69fc557dd32c48d2bc2cfdd106dc 100644 (file)
--- a/.azure-pipelines/steps/dependencies-linux.yml
+++ b/.azure-pipelines/steps/dependencies-linux.yml
@@ -1,10 +1,5 @@
 ---
 steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.7'
-    displayName: 'Use Python 3.7'
-
   - bash: |
       set -euo pipefail
       python -m pip install --upgrade pip meson

diff --git a/.azure-pipelines/steps/dependencies-python.yml b/.azure-pipelines/steps/dependencies-python.yml
new file mode 100644 (file)
index 0000000..fb3f6ab
--- /dev/null
+++ b/.azure-pipelines/steps/dependencies-python.yml
@@ -0,0 +1,6 @@
+---
+steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.7'
+    displayName: 'Use Python 3.7'

diff --git a/.azure-pipelines/steps/meson.yml b/.azure-pipelines/steps/meson.yml
index 5348cbef2e84b251cedef9df7cb5dbe7b030f48b..c4e6c6cd9bc869d7ef733f2fbbf04ea0a73cd604 100644 (file)
--- a/.azure-pipelines/steps/meson.yml
+++ b/.azure-pipelines/steps/meson.yml
@@ -23,7 +23,7 @@ steps:
   - bash: |
       set -euo pipefail
       meson test -C build --print-errorlogs --wrapper="${{ parameters.wrapper }}"
-      python3 scripts/meson-junit-report.py --project-name=xkbcommon \
+      python scripts/meson-junit-report.py --project-name=xkbcommon \
         --job-id='$(Build.BuildId)' --branch='$(Build.SourceBranch)' \
         --output=testlog.xml build/meson-logs/testlog*.json
     displayName: 'Test'

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f5308a76f8a6c1b2f221a6f213b66d1c01e21a02..ea209fecf490520668cbd51b2abdfdcb24ceb759 100644 (file)
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,6 +11,7 @@ jobs:
     pool:
       vmImage: 'ubuntu-16.04'
     steps:
+      - template: .azure-pipelines/steps/dependencies-python.yml
       - template: .azure-pipelines/steps/dependencies-linux.yml
       - template: .azure-pipelines/steps/meson.yml
         parameters:
@@ -23,6 +24,7 @@ jobs:
     pool:
       vmImage: 'macos-10.13'
     steps:
+      - template: .azure-pipelines/steps/dependencies-python.yml
       - template: .azure-pipelines/steps/dependencies-macos.yml
       - template: .azure-pipelines/steps/meson.yml
         parameters: