From a53bdf14930bb2849ce33d050674aca2de684204 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 1 May 2024 13:23:59 -0500 Subject: [PATCH] Fix Alpine SB legs --- eng/pipelines/templates/stages/vmr-build.yml | 2 -- src/SourceBuild/content/test/tests.proj | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 21e2c2ce6844..2f9c1ed10582 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -123,7 +123,6 @@ stages: artifactsRid: alpine.3.19-x64 pool: ${{ parameters.pool_Linux }} container: ${{ variables.alpine319Container }} - targetOS: linux-musl buildFromArchive: false # 🚫 buildSourceOnly: true # ✅ enablePoison: true # ✅ @@ -144,7 +143,6 @@ stages: architecture: x64 pool: ${{ parameters.pool_Linux }} container: ${{ variables.alpine319Container }} - targetOS: linux-musl buildFromArchive: false # 🚫 buildSourceOnly: true # ✅ enablePoison: false # 🚫 diff --git a/src/SourceBuild/content/test/tests.proj b/src/SourceBuild/content/test/tests.proj index cf3d38e47075..411aff8890f5 100644 --- a/src/SourceBuild/content/test/tests.proj +++ b/src/SourceBuild/content/test/tests.proj @@ -11,7 +11,7 @@ - <_RunScenarioTests Condition="'$(BuildOS)' != 'windows' and '$(__PortableTargetOS.ToLowerInvariant())' != '$(TargetOS.ToLowerInvariant())'">false + <_RunScenarioTests Condition="'$(BuildOS)' != 'windows' and '$(DotNetBuildSourceOnly)' == 'false' and '$(__PortableTargetOS.ToLowerInvariant())' != '$(TargetOS.ToLowerInvariant())'">false <_RunScenarioTests Condition="'$(UseOfficialBuildVersioning)' == 'false'">false