mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix Alpine SB legs (#19623)

Browse source
This commit is contained in:
Matt Thalman 2024-05-01 14:32:55 -05:00 committed by GitHub
parent dbe6e6a6a7
commit d092a8afb7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eng/pipelines/templates/stages/vmr-build.yml
View file

@ -123,7 +123,6 @@ stages:
artifactsRid: alpine.3.19-x64 artifactsRid: alpine.3.19-x64
pool: ${{ parameters.pool_Linux }} pool: ${{ parameters.pool_Linux }}
container: ${{ variables.alpine319Container }} container: ${{ variables.alpine319Container }}
targetOS: linux-musl
buildFromArchive: false # 🚫 buildFromArchive: false # 🚫
buildSourceOnly: true # ✅ buildSourceOnly: true # ✅
enablePoison: true # ✅ enablePoison: true # ✅
@ -144,7 +143,6 @@ stages:
architecture: x64 architecture: x64
pool: ${{ parameters.pool_Linux }} pool: ${{ parameters.pool_Linux }}
container: ${{ variables.alpine319Container }} container: ${{ variables.alpine319Container }}
targetOS: linux-musl
buildFromArchive: false # 🚫 buildFromArchive: false # 🚫
buildSourceOnly: true # ✅ buildSourceOnly: true # ✅
enablePoison: false # 🚫 enablePoison: false # 🚫

2
src/SourceBuild/content/test/tests.proj
View file

@ -11,7 +11,7 @@
<!-- Skip scenario tests if the portable OS (determined from the host machine) is different from the target OS <!-- Skip scenario tests if the portable OS (determined from the host machine) is different from the target OS
since the tests require the ability to execute the built SDK. An example of where this would be disabled is since the tests require the ability to execute the built SDK. An example of where this would be disabled is
cross-build of using Mariner to build for Alpine (linux vs linux-musl). --> cross-build of using Mariner to build for Alpine (linux vs linux-musl). -->
<_RunScenarioTests Condition="'$(BuildOS)' != 'windows' and '$(__PortableTargetOS.ToLowerInvariant())' != '$(TargetOS.ToLowerInvariant())'">false</_RunScenarioTests> <_RunScenarioTests Condition="'$(BuildOS)' != 'windows' and '$(DotNetBuildSourceOnly)' == 'false' and '$(__PortableTargetOS.ToLowerInvariant())' != '$(TargetOS.ToLowerInvariant())'">false</_RunScenarioTests>
<!-- The scenario tests are not supported when unofficial build versioning is used. --> <!-- The scenario tests are not supported when unofficial build versioning is used. -->
<_RunScenarioTests Condition="'$(UseOfficialBuildVersioning)' == 'false'">false</_RunScenarioTests> <_RunScenarioTests Condition="'$(UseOfficialBuildVersioning)' == 'false'">false</_RunScenarioTests>