Make sure original arch name could match

juju · Sep 12, 2022 · 4dbe60c · 4dbe60c
1 parent 961d55c
commit 4dbe60c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/arch/arch.go b/arch/arch.go
@@ -63,7 +63,7 @@ var archREs = []struct {
 	{regexp.MustCompile("aarch64"), ARM64},
 	{regexp.MustCompile("ppc64|ppc64el|ppc64le"), PPC64EL},
 	{regexp.MustCompile("s390x"), S390X},
-	{regexp.MustCompile("risc$|risc-[vV]64"), RISCV64},
+	{regexp.MustCompile("riscv64|risc$|risc-[vV]64"), RISCV64},
 }
 
 // Override for testing.

diff --git a/arch/arch_test.go b/arch/arch_test.go
@@ -40,6 +40,7 @@ func (s *archSuite) TestNormaliseArch(c *gc.C) {
 		{"ppc64le", "ppc64el"},
 		{"ppc64", "ppc64el"},
 		{"s390x", "s390x"},
+		{"riscv64", "riscv64"},
 		{"risc", "riscv64"},
 		{"risc-v64", "riscv64"},
 		{"risc-V64", "riscv64"},