Skip to content

Commit d092a8a

Browse files
authored
Fix Alpine SB legs (#19623)
1 parent dbe6e6a commit d092a8a

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ stages:
123123
artifactsRid: alpine.3.19-x64
124124
pool: ${{ parameters.pool_Linux }}
125125
container: ${{ variables.alpine319Container }}
126-
targetOS: linux-musl
127126
buildFromArchive: false # 🚫
128127
buildSourceOnly: true #
129128
enablePoison: true #
@@ -144,7 +143,6 @@ stages:
144143
architecture: x64
145144
pool: ${{ parameters.pool_Linux }}
146145
container: ${{ variables.alpine319Container }}
147-
targetOS: linux-musl
148146
buildFromArchive: false # 🚫
149147
buildSourceOnly: true #
150148
enablePoison: false # 🚫

src/SourceBuild/content/test/tests.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- Skip scenario tests if the portable OS (determined from the host machine) is different from the target OS
1212
since the tests require the ability to execute the built SDK. An example of where this would be disabled is
1313
cross-build of using Mariner to build for Alpine (linux vs linux-musl). -->
14-
<_RunScenarioTests Condition="'$(BuildOS)' != 'windows' and '$(__PortableTargetOS.ToLowerInvariant())' != '$(TargetOS.ToLowerInvariant())'">false</_RunScenarioTests>
14+
<_RunScenarioTests Condition="'$(BuildOS)' != 'windows' and '$(DotNetBuildSourceOnly)' == 'false' and '$(__PortableTargetOS.ToLowerInvariant())' != '$(TargetOS.ToLowerInvariant())'">false</_RunScenarioTests>
1515

1616
<!-- The scenario tests are not supported when unofficial build versioning is used. -->
1717
<_RunScenarioTests Condition="'$(UseOfficialBuildVersioning)' == 'false'">false</_RunScenarioTests>

0 commit comments

Comments
 (0)