fix: improve goarch to pkg conversion

also added tests refs goreleaser/goreleaser#3998
goreleaser · May 18, 2023 · 312fd85 · 312fd85
1 parent c20618c
commit 312fd85
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/apk/apk.go b/apk/apk.go
@@ -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

diff --git a/arch/arch.go b/arch/arch.go
@@ -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

diff --git a/deb/deb.go b/deb/deb.go
@@ -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",
 }

diff --git a/deb/deb_test.go b/deb/deb_test.go
@@ -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) {

diff --git a/rpm/rpm.go b/rpm/rpm.go
@@ -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
 }
 

diff --git a/rpm/rpm_test.go b/rpm/rpm_test.go
@@ -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) {