From a4e28800bb3fbdd8b411b781fcacaff8ad275cba Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 4 Sep 2024 10:52:35 -0700 Subject: [PATCH 1/2] Build NativeAOT-iOS runtime tests as standalone to restore test runs --- .../runtimes/build-runtime-tests-and-send-to-helix.yml | 6 ++++-- .../common/templates/runtimes/build-runtime-tests.yml | 8 ++++++++ .../extra-platforms/runtime-extra-platforms-ioslike.yml | 1 + .../runtime-extra-platforms-ioslikesimulator.yml | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml index b0a2043bbd5710..2ac52ca77eb353 100644 --- a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml +++ b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml @@ -19,6 +19,9 @@ parameters: variables: {} pool: '' dependsOn: [] + compileOnHelix: false + interpreter: false + buildAllTestsAsStandalone: false #arcade-specific parameters condition: always() continueOnError: false @@ -27,8 +30,6 @@ parameters: enableMicrobuild: '' gatherAssetManifests: false shouldContinueOnError: false - compileOnHelix: false - interpreter: false steps: - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests.yml @@ -38,6 +39,7 @@ steps: archType: ${{ parameters.archType }} buildConfig: ${{ parameters.buildConfig }} testBuildArgs: ${{ parameters.testBuildArgs }} + buildAllTestsAsStandalone: ${{ parameters.buildAllTestsAsStandalone }} # Build a Mono AOT cross-compiler for non-amd64 targets (in this case, just arm64) - ${{ if and(eq(parameters.runtimeFlavor, 'mono'), in(parameters.runtimeVariant, 'llvmaot', 'llvmfullaot', 'minifullaot')) }}: - ${{ if eq(parameters.archType, 'arm64') }}: diff --git a/eng/pipelines/common/templates/runtimes/build-runtime-tests.yml b/eng/pipelines/common/templates/runtimes/build-runtime-tests.yml index f9ef84a49c164a..a822ccf28fd288 100644 --- a/eng/pipelines/common/templates/runtimes/build-runtime-tests.yml +++ b/eng/pipelines/common/templates/runtimes/build-runtime-tests.yml @@ -4,6 +4,7 @@ parameters: archType: '' buildConfig: '' testBuildArgs: '' + buildAllTestsAsStandalone: false #arcade-specific parameters condition: always() continueOnError: false @@ -18,6 +19,13 @@ steps: - ${{ if eq(parameters.osGroup, 'windows') }}: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(crossArg) ci ${{ parameters.archType }} $(buildConfigUpper) $(_nativeSanitizersArg) $(priorityArg) $(runtimeFlavorArgs) ${{ parameters.testBuildArgs }} $(runtimeVariantArg) $(librariesConfigurationArg) displayName: Build Tests + env: + ${{ if eq(parameters.buildAllTestsAsStandalone, true) }}: + BuildAllTestsAsStandalone: true + - ${{ if ne(parameters.osGroup, 'windows') }}: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(crossArg) ci os ${{ parameters.osGroup }} ${{ parameters.archType }} $(buildConfigUpper) $(_nativeSanitizersArg) $(priorityArg) $(runtimeFlavorArgs) ${{ parameters.testBuildArgs }} $(runtimeVariantArg) $(librariesConfigurationArg) displayName: Build Tests + env: + ${{ if eq(parameters.buildAllTestsAsStandalone, true) }}: + BuildAllTestsAsStandalone: true diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml index 9794c736e2e823..ab081b2c3c4418 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml @@ -165,3 +165,4 @@ jobs: creator: dotnet-bot testBuildArgs: tree nativeaot/SmokeTests /p:BuildNativeAOTRuntimePack=true testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig) + buildAllTestsAsStandalone: true diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml index 7ce0a0c3568aac..714acd5b9c159f 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml @@ -139,3 +139,4 @@ jobs: creator: dotnet-bot testBuildArgs: tree nativeaot/SmokeTests /p:BuildNativeAOTRuntimePack=true testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig) + buildAllTestsAsStandalone: true From 0202b0a9cbba148fa1e7a9f46d828275303f26bc Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 5 Sep 2024 10:40:35 -0700 Subject: [PATCH 2/2] Fix catalyst as well --- .../extra-platforms/runtime-extra-platforms-maccatalyst.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml index 8c9d16d9701ae1..3eac90bcf95661 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml @@ -112,6 +112,7 @@ jobs: - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml parameters: creator: dotnet-bot + buildAllTestsAsStandalone: true testBuildArgs: tree nativeaot/SmokeTests /p:BuildNativeAOTRuntimePack=true testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig) @@ -149,5 +150,6 @@ jobs: - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml parameters: creator: dotnet-bot + buildAllTestsAsStandalone: true testBuildArgs: tree nativeaot/SmokeTests /p:BuildNativeAOTRuntimePack=true /p:DevTeamProvisioning=adhoc /p:EnableAppSandbox=true testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)