Commit 92a7aba6adc3667faaf2fd181b20b18893d04388
2019-12-28T16:05:04
ci: use consistent python for all jobs Signed-off-by: Ran Benita <ran@unusedvar.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
diff --git a/.azure-pipelines/steps/dependencies-linux.yml b/.azure-pipelines/steps/dependencies-linux.yml
index 6d6bcce..a444807 100644
--- 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
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 5348cbe..c4e6c6c 100644
--- 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 f5308a7..ea209fe 100644
--- 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: