Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ extends:
buildArchitecture: x64
# Do not publish zips and tarballs. The linux-x64 binaries are
# already published by Build_LinuxPortable_Release_x64
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkRpm=true'
linuxPortable: true
runTests: false
- template: eng/build.yml@self
Expand All @@ -301,7 +301,7 @@ extends:
runtimeIdentifier: 'linux-arm64'
# Do not publish zips and tarballs. The linux-x64 binaries are
# already published by Build_LinuxPortable_Release_x64
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true'
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:BuildSdkRpm=true'
linuxPortable: true
runTests: false
- template: eng/build.yml@self
Expand Down
4 changes: 2 additions & 2 deletions .vsts-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ stages:
buildArchitecture: x64
# Do not publish zips and tarballs. The linux-x64 binaries are
# already published by Build_LinuxPortable_Release_x64
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkRpm=true'
linuxPortable: true
runTests: false
- template: eng/build-pr.yml
Expand All @@ -260,7 +260,7 @@ stages:
runtimeIdentifier: 'linux-arm64'
# Do not publish zips and tarballs. The linux-x64 binaries are
# already published by Build_LinuxPortable_Release_x64
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true'
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:BuildSdkRpm=true'
linuxPortable: true
runTests: false
- template: eng/build-pr.yml
Expand Down
12 changes: 5 additions & 7 deletions src/redist/targets/GenerateRPMs.targets
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
build environment. https://github.com/dotnet/sdk/issues/41910 -->
<Target Name="GenerateRpmsInner"
DependsOnTargets="TestFPMTool;BuildRpms"
Condition=" '$(IsRPMBasedDistro)' == 'True' "
Condition=" '$(BuildSdkRpm)' == 'True' "
Outputs="@(GeneratedInstallers)"/>

<Target Name="BuildRpms"
DependsOnTargets="GenerateSdkRpm"
Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "/>
Condition=" '$(BuildSdkRpm)' == 'True' and '$(FPMPresent)' == 'True' "/>

<Target Name="GenerateSdkRpm"
DependsOnTargets="SetupRpmProps">
Expand Down Expand Up @@ -317,14 +317,12 @@
<FPMPresent Condition=" '$(FPMExitCode)' == '0' ">True</FPMPresent>
</PropertyGroup>

<!-- Workaround for Jenkins machines that don't have the necessary packages https://github.com/dotnet/core-setup/issues/2260 -->
<Message Condition=" '$(FPMPresent)' != 'True' "
Text="FPM tool Not found, RPM packages will not be built."
Importance="High"/>
<Error Condition=" '$(FPMPresent)' != 'True' "
Text="FPM tool Not found, RPM packages will not be built." />
</Target>

<Target Name="TestSdkRpm"
Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(BuildSdkRpm)' == 'True' and '$(FPMPresent)' == 'True' "
Inputs="$(DownloadedNetCoreAppTargetingPackInstallerFile);
$(DownloadedNetStandardTargetingPackInstallerFile);
$(DownloadedNetCoreAppHostPackInstallerFile);
Expand Down