Skip to content

Commit 91cad4b

Browse files
akoeplingerakoeplinger
authored
[VMR] Add verticals for Linux/Windows NativeAOT runtime packs (#45154)
Fixes dotnet/source-build#4760
1 parent 2a10f1f commit 91cad4b

File tree

2 files changed

+139
-2
lines changed

2 files changed

+139
-2
lines changed

‎eng/pipelines/templates/stages/vmr-build.yml‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,20 @@ stages:
520520
extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true
521521
runTests: false
522522

523+
- template: ../jobs/vmr-build.yml
524+
parameters:
525+
buildName: LinuxBionic_NativeAOT_Shortstack
526+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
527+
vmrBranch: ${{ variables.VmrBranch }}
528+
architecture: arm
529+
pool: ${{ parameters.pool_Linux_Shortstack }}
530+
container: ${{ variables.linuxBionicCrossContainer }}
531+
crossRootFs: '/crossrootfs/x64'
532+
targetOS: linux-bionic
533+
targetArchitecture: arm
534+
extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true
535+
runTests: false
536+
523537
- template: ../jobs/vmr-build.yml
524538
parameters:
525539
buildName: LinuxBionic_Shortstack
@@ -849,6 +863,20 @@ stages:
849863
targetOS: linux
850864
targetArchitecture: arm
851865

866+
- template: ../jobs/vmr-build.yml
867+
parameters:
868+
buildName: AzureLinux_x64_Cross_ShortStack_NativeAOT
869+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
870+
vmrBranch: ${{ variables.VmrBranch }}
871+
architecture: arm
872+
pool: ${{ parameters.pool_Linux }}
873+
container: ${{ variables.azurelinuxArmCrossContainer }}
874+
crossRootFs: '/crossrootfs/arm'
875+
targetOS: linux
876+
targetArchitecture: arm
877+
extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true
878+
runTests: false
879+
852880
- template: ../jobs/vmr-build.yml
853881
parameters:
854882
buildName: AzureLinux_x64_Cross
@@ -972,6 +1000,51 @@ stages:
9721000
extraProperties: /p:DotNetBuildMonoCrossAOT=true
9731001
runTests: false
9741002

1003+
- template: ../jobs/vmr-build.yml
1004+
parameters:
1005+
buildName: AzureLinux_x64_Cross_ShortStack_Alpine_NativeAOT
1006+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
1007+
vmrBranch: ${{ variables.VmrBranch }}
1008+
architecture: x64
1009+
pool: ${{ parameters.pool_Linux }}
1010+
container: ${{ variables.azurelinuxX64AlpineCrossContainer }}
1011+
crossRootFs: '/crossrootfs/x64'
1012+
targetOS: linux-musl
1013+
targetArchitecture: x64
1014+
targetRid: ${{ variables.linuxMuslX64Rid }}
1015+
extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true
1016+
runTests: false
1017+
1018+
- template: ../jobs/vmr-build.yml
1019+
parameters:
1020+
buildName: AzureLinux_x64_Cross_ShortStack_Alpine_NativeAOT
1021+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
1022+
vmrBranch: ${{ variables.VmrBranch }}
1023+
architecture: arm
1024+
pool: ${{ parameters.pool_Linux }}
1025+
container: ${{ variables.azurelinuxArmAlpineCrossContainer }}
1026+
crossRootFs: '/crossrootfs/arm'
1027+
targetOS: linux-musl
1028+
targetArchitecture: arm
1029+
targetRid: ${{ variables.linuxMuslArmRid }}
1030+
extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true
1031+
runTests: false
1032+
1033+
- template: ../jobs/vmr-build.yml
1034+
parameters:
1035+
buildName: AzureLinux_x64_Cross_ShortStack_Alpine_NativeAOT
1036+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
1037+
vmrBranch: ${{ variables.VmrBranch }}
1038+
architecture: arm64
1039+
pool: ${{ parameters.pool_Linux }}
1040+
container: ${{ variables.azurelinuxArm64AlpineCrossContainer }}
1041+
crossRootFs: '/crossrootfs/arm64'
1042+
targetOS: linux-musl
1043+
targetArchitecture: arm64
1044+
targetRid: ${{ variables.linuxMuslArm64Rid }}
1045+
extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true
1046+
runTests: false
1047+
9751048
- template: ../jobs/vmr-build.yml
9761049
parameters:
9771050
buildName: AzureLinux_x64_Cross_ShortStack_Mono_CrossAOT
@@ -986,6 +1059,20 @@ stages:
9861059
extraProperties: /p:DotNetBuildMonoCrossAOT=true
9871060
runTests: false
9881061

1062+
- template: ../jobs/vmr-build.yml
1063+
parameters:
1064+
buildName: AzureLinux_x64_ShortStack_NativeAOT
1065+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
1066+
vmrBranch: ${{ variables.VmrBranch }}
1067+
architecture: x64
1068+
pool: ${{ parameters.pool_Linux_Shortstack }}
1069+
container: ${{ variables.azurelinuxX64CrossContainer }}
1070+
crossRootFs: '/crossrootfs/x64'
1071+
targetOS: linux
1072+
targetArchitecture: x64
1073+
extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true
1074+
runTests: false
1075+
9891076
- template: ../jobs/vmr-build.yml
9901077
parameters:
9911078
buildName: AzureLinux_x64_Cross_ShortStack_Mono_CrossAOT
@@ -1030,6 +1117,20 @@ stages:
10301117
extraProperties: /p:DotNetBuildMonoEnableLLVM=true /p:DotNetBuildMonoBundleLLVMOptimizer=false
10311118
runTests: false
10321119

1120+
- template: ../jobs/vmr-build.yml
1121+
parameters:
1122+
buildName: AzureLinux_x64_ShortStack_NativeAOT
1123+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
1124+
vmrBranch: ${{ variables.VmrBranch }}
1125+
architecture: arm64
1126+
pool: ${{ parameters.pool_Linux_Shortstack }}
1127+
container: ${{ variables.azurelinuxArm64CrossContainer }}
1128+
crossRootFs: '/crossrootfs/arm64'
1129+
targetOS: linux
1130+
targetArchitecture: arm64
1131+
extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true
1132+
runTests: false
1133+
10331134
- template: ../jobs/vmr-build.yml
10341135
parameters:
10351136
buildName: OSX
@@ -1122,6 +1223,18 @@ stages:
11221223
targetOS: windows
11231224
targetArchitecture: arm64
11241225

1226+
- template: ../jobs/vmr-build.yml
1227+
parameters:
1228+
buildName: Windows_ShortStack_NativeAOT
1229+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
1230+
vmrBranch: ${{ variables.VmrBranch }}
1231+
architecture: arm64
1232+
pool: ${{ parameters.pool_Windows }}
1233+
targetOS: windows
1234+
targetArchitecture: arm64
1235+
extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true
1236+
runTests: false
1237+
11251238
- template: ../jobs/vmr-build.yml
11261239
parameters:
11271240
buildName: Windows_Mono
@@ -1133,6 +1246,18 @@ stages:
11331246
targetOS: windows
11341247
targetArchitecture: x64
11351248

1249+
- template: ../jobs/vmr-build.yml
1250+
parameters:
1251+
buildName: Windows_ShortStack_NativeAOT
1252+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
1253+
vmrBranch: ${{ variables.VmrBranch }}
1254+
architecture: x64
1255+
pool: ${{ parameters.pool_Windows }}
1256+
targetOS: windows
1257+
targetArchitecture: x64
1258+
extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true
1259+
runTests: false
1260+
11361261
- template: ../jobs/vmr-build.yml
11371262
parameters:
11381263
buildName: Windows_ShortStack_Mono_CrossAOT
@@ -1167,6 +1292,18 @@ stages:
11671292
targetOS: windows
11681293
targetArchitecture: x86
11691294

1295+
- template: ../jobs/vmr-build.yml
1296+
parameters:
1297+
buildName: Windows_ShortStack_NativeAOT
1298+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
1299+
vmrBranch: ${{ variables.VmrBranch }}
1300+
architecture: x86
1301+
pool: ${{ parameters.pool_Windows }}
1302+
targetOS: windows
1303+
targetArchitecture: x86
1304+
extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true
1305+
runTests: false
1306+
11701307
- template: ../jobs/vmr-build.yml
11711308
parameters:
11721309
buildName: Windows_Mono

‎src/SourceBuild/content/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<ShortStack Condition="'$(TargetOS)' == 'maccatalyst'">true</ShortStack>
3131
<ShortStack Condition="'$(TargetOS)' == 'android'">true</ShortStack>
3232
<ShortStack Condition="'$(TargetOS)' == 'linux-bionic'">true</ShortStack>
33-
<!-- NativeAOT Mac builds are short -->
34-
<ShortStack Condition="'$(TargetOS)' == 'osx' and '$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">true</ShortStack>
33+
<!-- NativeAOT builds are short -->
34+
<ShortStack Condition="'$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">true</ShortStack>
3535
<!-- Mono LLVM builds are short -->
3636
<ShortStack Condition="'$(MonoEnableLLVM)' == 'true' or '$(MonoAOTEnableLLVM)' == 'true'">true</ShortStack>
3737
<!-- Mono AOT cross compiler builds are short -->

0 commit comments

Comments
 (0)