mirror/ nfpm
1
1
Fork 0
mirror of https://github.com/goreleaser/nfpm synced 2024-04-26 03:25:06 +02:00
Code Issues Releases Activity

fix: improve goarch to pkg conversion 

also added tests

refs https://github.com/goreleaser/goreleaser/issues/3998
This commit is contained in:
Carlos Alexandro Becker 2023-05-18 01:24:50 +00:00
parent c20618cdd3
commit 312fd85338
No known key found for this signature in database
GPG Key ID: E61E2F7DC14AB940
6 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apk/apk.go
View File

@ -61,9 +61,9 @@ func init() {
var archToAlpine = map[string]string{
"386": "x86",
"amd64": "x86_64",
"arm64": "aarch64",
"arm6": "armhf",
"arm7": "armv7",
"arm64": "aarch64",
"ppc64le": "ppc64le",
"s390": "s390x",
}
@ -73,13 +73,6 @@ func ensureValidArch(info *nfpm.Info) *nfpm.Info {
info.Arch = info.APK.Arch
} else if arch, ok := archToAlpine[info.Arch]; ok {
info.Arch = arch
} else {
for k, v := range archToAlpine {
if strings.HasPrefix(info.Arch, k) {
info.Arch = v
break
}
}
}
return info

7
arch/arch.go
View File

@ -53,13 +53,6 @@ func ensureValidArch(info *nfpm.Info) *nfpm.Info {
info.Arch = info.ArchLinux.Arch
} else if arch, ok := archToArchLinux[info.Arch]; ok {
info.Arch = arch
} else {
for k, v := range archToArchLinux {
if strings.HasPrefix(info.Arch, k) {
info.Arch = v
break
}
}
}
return info

2
deb/deb.go
View File

@ -39,8 +39,8 @@ var archToDebian = map[string]string{
"arm5": "armel",
"arm6": "armhf",
"arm7": "armhf",
"mipsle": "mipsel",
"mips64le": "mips64el",
"mipsle": "mipsel",
"ppc64le": "ppc64el",
"s390": "s390x",
}

6
deb/deb_test.go
View File

@ -1376,6 +1376,12 @@ func TestArches(t *testing.T) {
info = ensureValidArch(info)
require.Equal(t, archToDebian[k], info.Arch)
})
t.Run("mips64lesoftfloat", func(t *testing.T) {
info := exampleInfo()
info.Arch = "mips64le"
info = ensureValidArch(info)
require.Equal(t, "mips64el", info.Arch)
})
}
t.Run("override", func(t *testing.T) {

4
rpm/rpm.go
View File

@ -64,9 +64,9 @@ var archToRPM = map[string]string{
"arm5": "armv5tel",
"arm6": "armv6hl",
"arm7": "armv7hl",
"mips": "mips",
"mips64le": "mips64el",
"mipsle": "mipsel",
"mipsle64": "mips64el",
"mips": "mips",
// TODO: other arches
}

6
rpm/rpm_test.go
View File

@ -504,6 +504,12 @@ func TestArches(t *testing.T) {
info = ensureValidArch(info)
require.Equal(t, archToRPM[k], info.Arch)
})
t.Run("mips64lesoftfloat", func(t *testing.T) {
info := exampleInfo()
info.Arch = "mips64lesoftfloat"
info = ensureValidArch(info)
require.Equal(t, "mips64el", info.Arch)
})
}
t.Run("override", func(t *testing.T) {