Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[release/3.1] Fix non-portable distrorid alpine generation #28227

Merged

Conversation

ayakael
Copy link

@ayakael ayakael commented Dec 17, 2021

init-distro-id.sh generates incorrect DistroRid on Alpine. While the expected DistroRid (alpine-x.xx-xxx) should only include macro version, init-distro-id.sh includes the micro version. This patches it to cut off the trailing subversion off of VERSION_ID by treating it the same way RHEL's VERSION_ID is treated.

Made as part of Alpine Linux dotnet31 / dotnet5 packaging project, see dotnet/source-build#2695

@ayakael ayakael changed the title Fix non-portable distrorid alpine generation [release/3.1] Fix non-portable distrorid alpine generation Dec 17, 2021
@safern safern requested a review from hoyosjs January 3, 2022 04:03
Copy link
Member

@hoyosjs hoyosjs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM in technical terms, but 3.1 is a protected branch - @jeffschwMSFT and @dotnet/source-build-internal is this something that's needed in 3.1? I don't know if we have non-portable commitments here or if it's OK for 3.1; this is very low risk as it explicitly needs to ask for a non-portable build.

@jeffschwMSFT
Copy link
Member

@safern this is a tell mode infra change. When is ok to merge? Thanks

@safern
Copy link
Member

safern commented Jan 21, 2022

@jeffschwMSFT the branch will be open ~4th February until the 7th

@jeffschwMSFT jeffschwMSFT added the Servicing-approved Approved for servicing release label Jan 21, 2022
@jeffschwMSFT
Copy link
Member

Marking approved (for tell mode) so that we merge once the branch is open.

@ayakael
Copy link
Author

ayakael commented Jan 21, 2022

Perfect, many thanks!

@carlossanlop
Copy link
Member

carlossanlop commented Mar 8, 2022

Branch is now open for servicing approved changes.

The OSX x64 CI failure seems unrelated to alpine.

Sign-off received, servicing-approved label applied. Merging now.

@carlossanlop carlossanlop merged commit c9d60c2 into dotnet:release/3.1 Mar 8, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Servicing-approved Approved for servicing release
Projects
None yet
5 participants