diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 199bf189964173..e41dc68fd49abc 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -141,7 +141,7 @@ extends: platforms: - linux_x64 - linux_musl_x64 - - osx_x64 + - osx_arm64 - windows_x64 jobParameters: nameSuffix: CoreCLR_Libraries @@ -214,7 +214,7 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: release platforms: - - osx_arm64 + - osx_x64 jobParameters: nameSuffix: CoreCLR_Libraries buildArgs: -s clr+libs -c $(_BuildConfig) @@ -245,7 +245,7 @@ extends: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - linux_arm64 - - osx_x64 + - osx_arm64 jobParameters: nameSuffix: Libraries_CheckedCoreCLR buildArgs: -s clr+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:ArchiveTests=true @@ -353,7 +353,7 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - osx_arm64 + - osx_x64 jobParameters: nameSuffix: Libraries_CheckedCoreCLR buildArgs: -s clr+libs -c $(_BuildConfig) -rc Checked @@ -376,7 +376,8 @@ extends: configOverride: Checked condition: >- or( - eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr_AppleSilicon.containsChange'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -1336,7 +1337,7 @@ extends: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - windows_x86 - - osx_arm64 + - osx_x64 helixQueuesTemplate: /eng/pipelines/installer/helix-queues-setup.yml jobParameters: nameSuffix: Installer_Build_And_Test @@ -1367,7 +1368,7 @@ extends: buildConfig: release platforms: - windows_x64 - - osx_x64 + - osx_arm64 - linux_x64 helixQueuesTemplate: /eng/pipelines/installer/helix-queues-setup.yml jobParameters: @@ -1591,7 +1592,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - osx_x64 + - osx_arm64 - linux_x64 - linux_arm64 - windows_x64 @@ -1614,7 +1615,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - osx_arm64 + - osx_x64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -1625,7 +1626,8 @@ extends: unifiedBuildConfigOverride: ${{ variables.debugOnPrReleaseOnRolling }} condition: >- or( - eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr_AppleSilicon.containsChange'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -1661,7 +1663,7 @@ extends: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - windows_x64 - - osx_x64 + - osx_arm64 - linux_x64 - linux_musl_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml @@ -1686,7 +1688,7 @@ extends: # | linux-arm64 | Debug | Release | # | windows-x86 | Debug | Release | # | linux-musl-x64 | Debug | Release | - # | OSX-x64 | Debug | Release | + # | osx-arm64 | Debug | Release | # | linux-musl-arm | Release | Release | # | linux-musl-arm64 | Release | Release | # | linux-x64 | Release | Release | @@ -1749,7 +1751,7 @@ extends: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - osx_x64 + - osx_arm64 helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: