From 92a7aba6adc3667faaf2fd181b20b18893d04388 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Sat, 28 Dec 2019 16:05:04 +0200 Subject: [PATCH] ci: use consistent python for all jobs Signed-off-by: Ran Benita --- .azure-pipelines/steps/dependencies-linux.yml | 5 ----- .azure-pipelines/steps/dependencies-python.yml | 6 ++++++ .azure-pipelines/steps/meson.yml | 2 +- azure-pipelines.yml | 2 ++ 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .azure-pipelines/steps/dependencies-python.yml 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: -- 2.7.4