mirror/nfpm
1
0
Fork 0
mirror of https://github.com/goreleaser/nfpm.git synced 2026-06-19 08:05:04 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix(rpm): conventionalfilename (#715)

Browse Source 
Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
This commit is contained in:
Carlos Alexandro Becker
2023-09-21 23:48:09 -03:00
committed by GitHub
parent c08c720987
commit bb6d0b9839
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpm/rpm.go
+8 -2
View File
@@ -88,7 +88,13 @@ func (*RPM) ConventionalFileName(info *nfpm.Info) string {
info = setDefaults(info)
// name-version-release.architecture.rpm
return fmt.Sprintf("%s-%s.%s.rpm", info.Name, formatVersion(info), info.Arch)
return fmt.Sprintf(
"%s-%s-%s.%s.rpm",
info.Name,
formatVersion(info),
defaultTo(info.Release, "1"),
info.Arch,
)
}
// ConventionalExtension returns the file name conventionally used for RPM packages
@@ -266,7 +272,7 @@ func formatVersion(info *nfpm.Info) string {
version += "+" + info.VersionMetadata
}
return version + "-" + info.Release
return version
}
func defaultTo(in, def string) string {
rpm/rpm_test.go
+12 -10
View File
@@ -118,7 +118,7 @@ func TestRPM(t *testing.T) {
version, err := rpm.Header.GetString(rpmutils.VERSION)
require.NoError(t, err)
require.Equal(t, "1.0.0-1", version)
require.Equal(t, "1.0.0", version)
release, err := rpm.Header.GetString(rpmutils.RELEASE)
require.NoError(t, err)
@@ -298,7 +298,7 @@ func TestWithRPMTags(t *testing.T) {
version, err := rpm.Header.GetString(rpmutils.VERSION)
require.NoError(t, err)
require.Equal(t, "1.0.0-3", version)
require.Equal(t, "1.0.0", version)
release, err := rpm.Header.GetString(rpmutils.RELEASE)
require.NoError(t, err)
@@ -329,7 +329,7 @@ func TestRPMVersion(t *testing.T) {
info.Version = "1.0.0" //nolint:golint,goconst
meta, err := buildRPMMeta(info)
require.NoError(t, err)
require.Equal(t, "1.0.0-1", meta.Version)
require.Equal(t, "1.0.0", meta.Version)
require.Equal(t, "1", meta.Release)
}
@@ -339,7 +339,7 @@ func TestRPMVersionWithRelease(t *testing.T) {
info.Release = "2"
meta, err := buildRPMMeta(info)
require.NoError(t, err)
require.Equal(t, "1.0.0-2", meta.Version)
require.Equal(t, "1.0.0", meta.Version)
require.Equal(t, "2", meta.Release)
}
@@ -351,14 +351,14 @@ func TestRPMVersionWithPrerelease(t *testing.T) {
info.Prerelease = "rc1" // nolint:goconst
meta, err := buildRPMMeta(info)
require.NoError(t, err)
require.Equal(t, "1.0.0~rc1-1", meta.Version)
require.Equal(t, "1.0.0~rc1", meta.Version)
require.Equal(t, "1", meta.Release)
info.Version = "1.0.0~rc1"
info.Prerelease = ""
meta, err = buildRPMMeta(info)
require.NoError(t, err)
require.Equal(t, "1.0.0~rc1-1", meta.Version)
require.Equal(t, "1.0.0~rc1", meta.Version)
require.Equal(t, "1", meta.Release)
}
@@ -371,7 +371,7 @@ func TestRPMVersionWithReleaseAndPrerelease(t *testing.T) {
info.Prerelease = "rc1"
meta, err := buildRPMMeta(info)
require.NoError(t, err)
require.Equal(t, "1.0.0~rc1-2", meta.Version)
require.Equal(t, "1.0.0~rc1", meta.Version)
require.Equal(t, "2", meta.Release)
info.Version = "1.0.0~rc1"
@@ -379,7 +379,7 @@ func TestRPMVersionWithReleaseAndPrerelease(t *testing.T) {
info.Prerelease = ""
meta, err = buildRPMMeta(info)
require.NoError(t, err)
require.Equal(t, "1.0.0~rc1-3", meta.Version)
require.Equal(t, "1.0.0~rc1", meta.Version)
require.Equal(t, "3", meta.Release)
}
@@ -391,14 +391,16 @@ func TestRPMVersionWithVersionMetadata(t *testing.T) {
info.VersionMetadata = ""
meta, err := buildRPMMeta(info)
require.NoError(t, err)
require.Equal(t, "1.0.0+meta-1", meta.Version)
require.Equal(t, "1.0.0+meta", meta.Version)
require.Equal(t, "1", meta.Release)
info.Version = "1.0.0"
info.VersionMetadata = "meta"
info.Release = "10"
meta, err = buildRPMMeta(nfpm.WithDefaults(info))
require.NoError(t, err)
require.Equal(t, "1.0.0+meta-10", meta.Version)
require.Equal(t, "1.0.0+meta", meta.Version)
require.Equal(t, "10", meta.Release)
}
func TestWithInvalidEpoch(t *testing.T) {
testdata/acceptance/rpm.dockerfile
Vendored
+1 -1
View File
@@ -123,7 +123,7 @@ RUN command -v zsh
# ---- env-var-version test ----
FROM min AS env-var-version
ENV EXPECTVER="Version : 1.0.0~0.1.b1+git.abcdefgh-1" \
ENV EXPECTVER="Version : 1.0.0~0.1.b1+git.abcdefgh" \
EXPECTREL="Release : 1"
RUN rpm -qpi /tmp/foo.rpm | sed -e 's/ \+/ /g' | grep "Version" > found.ver
RUN rpm -qpi /tmp/foo.rpm | sed -e 's/ \+/ /g' | grep "Release" > found.rel