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 @@ -213,7 +213,7 @@ extends:
# Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
officialBuildProperties: $(_officialBuildProperties)
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
osProperties: $(linuxOsPortableProperties) /p:BuildSdkRpm=true
runTests: false
- categoryName: Portable
container: azureLinux30fpm
Expand All @@ -222,7 +222,7 @@ extends:
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true
officialBuildProperties: $(_officialBuildProperties)
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
osProperties: $(linuxOsPortableProperties) /p:BuildSdkRpm=true
runTests: false
### MUSL ###
- categoryName: Musl
Expand Down
10 changes: 4 additions & 6 deletions src/Installer/redist-installer/targets/GenerateRPMs.targets
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@

<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 @@ -301,10 +301,8 @@
<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>

<!-- Removed the TestSdkRpm task as it would fail when the installed package exactly matched the upgrade package -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<IsDebianBaseDistro Condition=" $(HostRid.StartsWith('ubuntu')) OR $(HostRid.StartsWith('debian')) ">true</IsDebianBaseDistro>
<IsRPMBasedDistro Condition=" $(HostRid.StartsWith('rhel')) AND '$(HostRid)' != 'rhel.6-x64' ">true</IsRPMBasedDistro>
<IsRPMBasedDistro Condition=" $(HostRid.StartsWith('centos')) ">true</IsRPMBasedDistro>
<IsRPMBasedDistro Condition=" $(HostRid.StartsWith('azurelinux')) ">true</IsRPMBasedDistro>
<PublishNativeInstallers Condition=" '$(IslinuxPortable)' != 'true' AND '$(HostRid)' != 'rhel.6-x64' AND !$(Rid.StartsWith('linux-musl'))">true</PublishNativeInstallers>
<PublishArchives Condition=" '$(IslinuxPortable)' == 'true' OR ('$(IsDebianBaseDistro)' != 'true' AND '$(IsRPMBasedDistro)' != 'true') ">true</PublishArchives>
</PropertyGroup>
Expand Down
Loading