Skip to content

Commit 0058f74

Browse files
AjanZhongmergify[bot]
authored andcommitted
.azurepipelines: Introduce Build.Archlist for Azure GCC5 pipeline
Azure Ubuntu GCC5 pipeline builds packages with all architectures. However, UefiPayloadPkg supports multiple architectures, including IA32, X64 and AARCH64. In this case, Azure pipeline builds modules for IA32, X64 and AARCH64 architectures, generates FD with same FDF file. It leads build system failed to locate which module should be integrated into Flash image. Add Build.Archlist to specify architectures to be build with, and separate TARGET_UEFIPAYLOAD to TARGET_UEFIPAYLOAD_IA32_X64 and TARGET_UEFIPAYLOAD_AARCH64 to cover all supported architectures for UefiPayloadPkg package. Signed-off-by: Ajan Zhong <[email protected]>
1 parent f0a2015 commit 0058f74

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

.azurepipelines/templates/pr-gate-build-job.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,47 +28,66 @@ jobs:
2828
TARGET_GCC_ONLY:
2929
Build.Pkgs: 'EmbeddedPkg'
3030
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
31+
Build.Archlist: ${{ parameters.arch_list }}
3132
TARGET_ARM_ARMPLATFORM:
3233
Build.Pkgs: 'ArmPkg,ArmPlatformPkg'
3334
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
35+
Build.Archlist: ${{ parameters.arch_list }}
3436
TARGET_MDE_CPU:
3537
Build.Pkgs: 'MdePkg,UefiCpuPkg'
3638
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
39+
Build.Archlist: ${{ parameters.arch_list }}
3740
TARGET_MDEMODULE_DEBUG:
3841
Build.Pkgs: 'MdeModulePkg'
3942
Build.Targets: 'DEBUG,NOOPT'
43+
Build.Archlist: ${{ parameters.arch_list }}
4044
TARGET_MDEMODULE_RELEASE:
4145
Build.Pkgs: 'MdeModulePkg'
4246
Build.Targets: 'RELEASE,NO-TARGET'
47+
Build.Archlist: ${{ parameters.arch_list }}
4348
TARGET_NETWORK:
4449
Build.Pkgs: 'NetworkPkg,RedfishPkg'
4550
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
51+
Build.Archlist: ${{ parameters.arch_list }}
4652
TARGET_OTHER:
4753
Build.Pkgs: 'PcAtChipsetPkg,PrmPkg,ShellPkg,SourceLevelDebugPkg,StandaloneMmPkg,SignedCapsulePkg'
4854
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
55+
Build.Archlist: ${{ parameters.arch_list }}
4956
TARGET_FMP_FAT_TEST:
5057
Build.Pkgs: 'FmpDevicePkg,FatPkg,UnitTestFrameworkPkg,DynamicTablesPkg'
5158
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
59+
Build.Archlist: ${{ parameters.arch_list }}
5260
TARGET_CRYPTO_DEBUG:
5361
Build.Pkgs: 'CryptoPkg'
5462
Build.Targets: 'DEBUG,NOOPT'
63+
Build.Archlist: ${{ parameters.arch_list }}
5564
TARGET_CRYPTO_RELEASE:
5665
Build.Pkgs: 'CryptoPkg'
5766
Build.Targets: 'RELEASE,NO-TARGET'
67+
Build.Archlist: ${{ parameters.arch_list }}
5868
TARGET_FSP:
5969
Build.Pkgs: 'IntelFsp2Pkg,IntelFsp2WrapperPkg'
6070
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
71+
Build.Archlist: ${{ parameters.arch_list }}
6172
TARGET_SECURITY:
6273
Build.Pkgs: 'SecurityPkg'
6374
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
64-
TARGET_UEFIPAYLOAD:
75+
Build.Archlist: ${{ parameters.arch_list }}
76+
TARGET_UEFIPAYLOAD_IA32_X64:
6577
Build.Pkgs: 'UefiPayloadPkg'
6678
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
79+
Build.Archlist: 'IA32,X64'
80+
${{ if eq(parameters.tool_chain_tag, 'GCC5') }}:
81+
TARGET_UEFIPAYLOAD_AARCH64_GCC_ONLY:
82+
Build.Pkgs: 'UefiPayloadPkg'
83+
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
84+
Build.Archlist: 'AARCH64'
6785
TARGET_PLATFORMS:
6886
# For Platforms only check code. Leave it to Platform CI
6987
# to build them.
7088
Build.Pkgs: 'ArmVirtPkg,EmulatorPkg,OvmfPkg'
7189
Build.Targets: 'NO-TARGET,NOOPT'
90+
Build.Archlist: ${{ parameters.arch_list }}
7291

7392
workspace:
7493
clean: all
@@ -85,7 +104,7 @@ jobs:
85104
tool_chain_tag: ${{ parameters.tool_chain_tag }}
86105
build_pkgs: $(Build.Pkgs)
87106
build_targets: $(Build.Targets)
88-
build_archs: ${{ parameters.arch_list }}
107+
build_archs: $(Build.Archlist)
89108
usePythonVersion: ${{ parameters.usePythonVersion }}
90109
extra_install_step: ${{ parameters.extra_install_step }}
91110

0 commit comments

Comments
 (0)