-
Notifications
You must be signed in to change notification settings - Fork 630
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix publishing pre-release versions to AUR #3768
Conversation
fbe96cb
to
e533113
Compare
.github/aur/flux-bin/publish.sh
Outdated
@@ -28,20 +28,21 @@ git clone [email protected]:$PKGNAME $GITDIR 2>&1 | |||
CURRENT_PKGVER=$(cat $GITDIR/.SRCINFO | grep pkgver | awk '{ print $3 }') | |||
CURRENT_PKGREL=$(cat $GITDIR/.SRCINFO | grep pkgrel | awk '{ print $3 }') | |||
|
|||
export PKGVER=${VERSION/-/} | |||
# Transform pre-release to AUR compatible version format | |||
export PKGVER=${VERSION/-rc./rc} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So AUR wants v2.0.0rc1
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's what I've seen in some examples out there (e.g. 1.2.3alpha1
). Other options that would work: are 2.0.0rc.1
, 2.0.0.rc1
, or 2.0.0.rc.1
. I couldn't find any official guidelines, the only thing we know for certain is that -
is reserved as a separator between the version and the package release number.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm that’s strange, none of those are valid semver, according to spec
A pre-release version MAY be denoted by appending a hyphen
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would go with 2.0.0rc.1
which preserves the current replacement ${VERSION/-/}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True, but I don't think Arch intended to fully support or enforce semver in any way. Here's the section about package versioning from the guidelines: https://wiki.archlinux.org/title/Arch_package_guidelines#Package_versioning
f7222a8
to
2a9704c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thanks @relu
Fixes fluxcd#3767 Signed-off-by: Aurel Canciu <[email protected]>
2a9704c
to
52c7cca
Compare
Fixes #3767