From d77058221bcfe5ea88f41dedf5f7da2afe533e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 26 Nov 2024 18:28:04 +0100 Subject: [PATCH] [VMR] Add verticals for Linux/Windows NativeAOT runtime packs Fixes https://github.com/dotnet/source-build/issues/4760 --- eng/pipelines/templates/stages/vmr-build.yml | 137 ++++++++++++++++++ src/SourceBuild/content/Directory.Build.props | 4 +- 2 files changed, 139 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 1d2083389922..a39e43ba6939 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -520,6 +520,20 @@ stages: extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true runTests: false + - template: ../jobs/vmr-build.yml + parameters: + buildName: LinuxBionic_NativeAOT_Shortstack + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: arm + pool: ${{ parameters.pool_Linux_Shortstack }} + container: ${{ variables.linuxBionicCrossContainer }} + crossRootFs: '/crossrootfs/x64' + targetOS: linux-bionic + targetArchitecture: arm + extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true + runTests: false + - template: ../jobs/vmr-build.yml parameters: buildName: LinuxBionic_Shortstack @@ -849,6 +863,20 @@ stages: targetOS: linux targetArchitecture: arm + - template: ../jobs/vmr-build.yml + parameters: + buildName: AzureLinux_x64_Cross_ShortStack_NativeAOT + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: arm + pool: ${{ parameters.pool_Linux }} + container: ${{ variables.azurelinuxArmCrossContainer }} + crossRootFs: '/crossrootfs/arm' + targetOS: linux + targetArchitecture: arm + extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true + runTests: false + - template: ../jobs/vmr-build.yml parameters: buildName: AzureLinux_x64_Cross @@ -972,6 +1000,51 @@ stages: extraProperties: /p:DotNetBuildMonoCrossAOT=true runTests: false + - template: ../jobs/vmr-build.yml + parameters: + buildName: AzureLinux_x64_Cross_ShortStack_Alpine_NativeAOT + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: ${{ parameters.pool_Linux }} + container: ${{ variables.azurelinuxX64AlpineCrossContainer }} + crossRootFs: '/crossrootfs/x64' + targetOS: linux-musl + targetArchitecture: x64 + targetRid: ${{ variables.linuxMuslX64Rid }} + extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true + runTests: false + + - template: ../jobs/vmr-build.yml + parameters: + buildName: AzureLinux_x64_Cross_ShortStack_Alpine_NativeAOT + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: arm + pool: ${{ parameters.pool_Linux }} + container: ${{ variables.azurelinuxArmAlpineCrossContainer }} + crossRootFs: '/crossrootfs/arm' + targetOS: linux-musl + targetArchitecture: arm + targetRid: ${{ variables.linuxMuslArmRid }} + extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true + runTests: false + + - template: ../jobs/vmr-build.yml + parameters: + buildName: AzureLinux_x64_Cross_ShortStack_Alpine_NativeAOT + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: arm64 + pool: ${{ parameters.pool_Linux }} + container: ${{ variables.azurelinuxArm64AlpineCrossContainer }} + crossRootFs: '/crossrootfs/arm64' + targetOS: linux-musl + targetArchitecture: arm64 + targetRid: ${{ variables.linuxMuslArm64Rid }} + extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true + runTests: false + - template: ../jobs/vmr-build.yml parameters: buildName: AzureLinux_x64_Cross_ShortStack_Mono_CrossAOT @@ -986,6 +1059,20 @@ stages: extraProperties: /p:DotNetBuildMonoCrossAOT=true runTests: false + - template: ../jobs/vmr-build.yml + parameters: + buildName: AzureLinux_x64_ShortStack_NativeAOT + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: ${{ parameters.pool_Linux_Shortstack }} + container: ${{ variables.azurelinuxX64CrossContainer }} + crossRootFs: '/crossrootfs/x64' + targetOS: linux + targetArchitecture: x64 + extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true + runTests: false + - template: ../jobs/vmr-build.yml parameters: buildName: AzureLinux_x64_Cross_ShortStack_Mono_CrossAOT @@ -1030,6 +1117,20 @@ stages: extraProperties: /p:DotNetBuildMonoEnableLLVM=true /p:DotNetBuildMonoBundleLLVMOptimizer=false runTests: false + - template: ../jobs/vmr-build.yml + parameters: + buildName: AzureLinux_x64_ShortStack_NativeAOT + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: arm64 + pool: ${{ parameters.pool_Linux_Shortstack }} + container: ${{ variables.azurelinuxArm64CrossContainer }} + crossRootFs: '/crossrootfs/arm64' + targetOS: linux + targetArchitecture: arm64 + extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true + runTests: false + - template: ../jobs/vmr-build.yml parameters: buildName: OSX @@ -1122,6 +1223,18 @@ stages: targetOS: windows targetArchitecture: arm64 + - template: ../jobs/vmr-build.yml + parameters: + buildName: Windows_ShortStack_NativeAOT + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: arm64 + pool: ${{ parameters.pool_Windows }} + targetOS: windows + targetArchitecture: arm64 + extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true + runTests: false + - template: ../jobs/vmr-build.yml parameters: buildName: Windows_Mono @@ -1133,6 +1246,18 @@ stages: targetOS: windows targetArchitecture: x64 + - template: ../jobs/vmr-build.yml + parameters: + buildName: Windows_ShortStack_NativeAOT + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: ${{ parameters.pool_Windows }} + targetOS: windows + targetArchitecture: x64 + extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true + runTests: false + - template: ../jobs/vmr-build.yml parameters: buildName: Windows_ShortStack_Mono_CrossAOT @@ -1167,6 +1292,18 @@ stages: targetOS: windows targetArchitecture: x86 + - template: ../jobs/vmr-build.yml + parameters: + buildName: Windows_ShortStack_NativeAOT + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x86 + pool: ${{ parameters.pool_Windows }} + targetOS: windows + targetArchitecture: x86 + extraProperties: /p:DotNetBuildRuntimeNativeAOTRuntimePack=true + runTests: false + - template: ../jobs/vmr-build.yml parameters: buildName: Windows_Mono diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 2de080d8f33e..d3ed10991b41 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -30,8 +30,8 @@ true true true - - true + + true true