mirror of https://github.com/acidanthera/audk.git
CI: make Python version configurable
Add a new parameter "usePythonVersion" to the CI job templates. This makes it possible to specify the version of Python to use. The default value is '', in which case Python will not be downloaded at runtime and the one provided by the VM/container image will be used. Additionally, add a template .azurepipelines/templates/defaults.yml, from which the default Pyhton version string can be obtained. Signed-off-by: Oliver Steffen <osteffen@redhat.com> Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com> Acked-by: Ard Biesheuvel <ardb@kernel.org> Acked-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Chris Fernald <chfernal@microsoft.com>
This commit is contained in:
parent
015a001b03
commit
3579551734
|
@ -13,13 +13,13 @@ pr:
|
||||||
- master
|
- master
|
||||||
- stable/*
|
- stable/*
|
||||||
|
|
||||||
|
variables:
|
||||||
|
- template: templates/defaults.yml
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- template: templates/pr-gate-build-job.yml
|
- template: templates/pr-gate-build-job.yml
|
||||||
parameters:
|
parameters:
|
||||||
tool_chain_tag: 'GCC5'
|
tool_chain_tag: 'GCC5'
|
||||||
vm_image: 'ubuntu-latest'
|
vm_image: 'ubuntu-latest'
|
||||||
arch_list: "IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64"
|
arch_list: "IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64"
|
||||||
extra_install_step:
|
usePythonVersion: ${{ variables.default_python_version }}
|
||||||
- bash: sudo apt-get install -y lcov
|
|
||||||
displayName: Install Code Coverage Tools
|
|
||||||
condition: and(gt(variables.pkg_count, 0), succeeded())
|
|
||||||
|
|
|
@ -12,12 +12,16 @@ pr:
|
||||||
- master
|
- master
|
||||||
- stable/*
|
- stable/*
|
||||||
|
|
||||||
|
variables:
|
||||||
|
- template: templates/defaults.yml
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- template: templates/pr-gate-build-job.yml
|
- template: templates/pr-gate-build-job.yml
|
||||||
parameters:
|
parameters:
|
||||||
tool_chain_tag: 'VS2019'
|
tool_chain_tag: 'VS2019'
|
||||||
vm_image: 'windows-2019'
|
vm_image: 'windows-2019'
|
||||||
arch_list: "IA32,X64"
|
arch_list: "IA32,X64"
|
||||||
|
usePythonVersion: ${{ variables.default_python_version }}
|
||||||
extra_install_step:
|
extra_install_step:
|
||||||
- powershell: choco install opencppcoverage; Write-Host "##vso[task.prependpath]C:\Program Files\OpenCppCoverage"
|
- powershell: choco install opencppcoverage; Write-Host "##vso[task.prependpath]C:\Program Files\OpenCppCoverage"
|
||||||
displayName: Install Code Coverage Tool
|
displayName: Install Code Coverage Tool
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
## @file
|
||||||
|
# File templates/default.yml
|
||||||
|
#
|
||||||
|
# template file containing common default values
|
||||||
|
#
|
||||||
|
# Copyright (c) Red Hat, Inc.
|
||||||
|
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||||
|
##
|
||||||
|
|
||||||
|
variables:
|
||||||
|
default_python_version: ">=3.10.6"
|
|
@ -34,6 +34,9 @@ parameters:
|
||||||
- name: extra_install_step
|
- name: extra_install_step
|
||||||
type: stepList
|
type: stepList
|
||||||
default: []
|
default: []
|
||||||
|
- name: usePythonVersion
|
||||||
|
type: string
|
||||||
|
default: ''
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- checkout: self
|
- checkout: self
|
||||||
|
@ -42,8 +45,9 @@ steps:
|
||||||
|
|
||||||
- task: UsePythonVersion@0
|
- task: UsePythonVersion@0
|
||||||
inputs:
|
inputs:
|
||||||
versionSpec: ">=3.10.6"
|
versionSpec: ${{ parameters.usePythonVersion }}
|
||||||
architecture: "x64"
|
architecture: "x64"
|
||||||
|
condition: ne('${{ parameters.usePythonVersion }}', '')
|
||||||
|
|
||||||
- script: pip install -r pip-requirements.txt --upgrade
|
- script: pip install -r pip-requirements.txt --upgrade
|
||||||
displayName: 'Install/Upgrade pip modules'
|
displayName: 'Install/Upgrade pip modules'
|
||||||
|
|
|
@ -13,6 +13,7 @@ parameters:
|
||||||
vm_image: ''
|
vm_image: ''
|
||||||
arch_list: ''
|
arch_list: ''
|
||||||
extra_install_step: []
|
extra_install_step: []
|
||||||
|
usePythonVersion: ''
|
||||||
|
|
||||||
# Build step
|
# Build step
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -78,6 +79,7 @@ jobs:
|
||||||
build_pkgs: $(Build.Pkgs)
|
build_pkgs: $(Build.Pkgs)
|
||||||
build_targets: $(Build.Targets)
|
build_targets: $(Build.Targets)
|
||||||
build_archs: ${{ parameters.arch_list }}
|
build_archs: ${{ parameters.arch_list }}
|
||||||
|
usePythonVersion: ${{ parameters.usePythonVersion }}
|
||||||
extra_install_step: ${{ parameters.extra_install_step }}
|
extra_install_step: ${{ parameters.extra_install_step }}
|
||||||
|
|
||||||
- job: Build_${{ parameters.tool_chain_tag }}_TARGET_CODE_COVERAGE
|
- job: Build_${{ parameters.tool_chain_tag }}_TARGET_CODE_COVERAGE
|
||||||
|
|
|
@ -12,6 +12,7 @@ parameters:
|
||||||
build_pkgs: ''
|
build_pkgs: ''
|
||||||
build_targets: ''
|
build_targets: ''
|
||||||
build_archs: ''
|
build_archs: ''
|
||||||
|
usePythonVersion: ''
|
||||||
extra_install_step: []
|
extra_install_step: []
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
@ -21,8 +22,9 @@ steps:
|
||||||
|
|
||||||
- task: UsePythonVersion@0
|
- task: UsePythonVersion@0
|
||||||
inputs:
|
inputs:
|
||||||
versionSpec: '>=3.10.6'
|
versionSpec: ${{ parameters.usePythonVersion }}
|
||||||
architecture: 'x64'
|
architecture: "x64"
|
||||||
|
condition: ne('${{ parameters.usePythonVersion }}', '')
|
||||||
|
|
||||||
- script: pip install -r pip-requirements.txt --upgrade
|
- script: pip install -r pip-requirements.txt --upgrade
|
||||||
displayName: 'Install/Upgrade pip modules'
|
displayName: 'Install/Upgrade pip modules'
|
||||||
|
|
Loading…
Reference in New Issue