diff options
| -rw-r--r-- | .azurepipelines/Ubuntu-GCC5.yml | 3 | ||||
| -rw-r--r-- | .azurepipelines/templates/basetools-build-steps.yml | 9 | ||||
| -rw-r--r-- | .azurepipelines/templates/defaults.yml | 1 |
3 files changed, 3 insertions, 10 deletions
diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-GCC5.yml index 4f9dcf0170..c3f29625a5 100644 --- a/.azurepipelines/Ubuntu-GCC5.yml +++ b/.azurepipelines/Ubuntu-GCC5.yml @@ -21,5 +21,6 @@ jobs: parameters:
tool_chain_tag: 'GCC5'
vm_image: 'ubuntu-latest'
+ container: ${{ variables.default_linux_image }}
arch_list: "IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64"
- usePythonVersion: ${{ variables.default_python_version }}
+ usePythonVersion: '' # use Python from the container image
diff --git a/.azurepipelines/templates/basetools-build-steps.yml b/.azurepipelines/templates/basetools-build-steps.yml index d8c108c6e2..a72758bc33 100644 --- a/.azurepipelines/templates/basetools-build-steps.yml +++ b/.azurepipelines/templates/basetools-build-steps.yml @@ -10,15 +10,6 @@ parameters: tool_chain_tag: ''
steps:
-- ${{ if contains(parameters.tool_chain_tag, 'GCC') }}:
- - bash: sudo apt-get update
- displayName: Update apt
- condition: and(gt(variables.pkg_count, 0), succeeded())
-
- - bash: sudo apt-get install gcc g++ make uuid-dev
- displayName: Install required tools
- condition: and(gt(variables.pkg_count, 0), succeeded())
-
- task: CmdLine@1
displayName: Build Base Tools from source
inputs:
diff --git a/.azurepipelines/templates/defaults.yml b/.azurepipelines/templates/defaults.yml index b4909448bd..74d6b41783 100644 --- a/.azurepipelines/templates/defaults.yml +++ b/.azurepipelines/templates/defaults.yml @@ -9,3 +9,4 @@ variables:
default_python_version: ">=3.10.6"
+ default_linux_image: "ghcr.io/tianocore/containers/fedora-35-test:47addc9"
|