automataCI: fixed 'linux-any' instead of 'any' bug

It appears the .deb package recognizes 'linux-any' as a single 'any' value, breaking its conventional pattern. Hence, let's fix it. This patch fixes 'linux-any' instead of 'any' bug in automataCI/ directory. Co-authored-by: Shuralyov, Jean <[email protected]> Co-authored-by: Galyna, Cory <[email protected]> Co-authored-by: (Holloway) Chew, Kean Ho <[email protected]> Signed-off-by: (Holloway) Chew, Kean Ho <[email protected]>
ChewKeanHo · May 21, 2024 · 8caa397 · 8caa397
1 parent 004aaae
commit 8caa397
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 25 deletions.
diff --git a/automataCI/services/compilers/deb.ps1 b/automataCI/services/compilers/deb.ps1
@@ -400,35 +400,37 @@ function DEB-Get-Architecture {
 
 	# process os
 	switch ($___os) {
-	"dragonfly" {
-		$___output="dragonflybsd"
+	linux {
+		$___output = ""
+	} dragonfly {
+		$___output = "dragonflybsd-"
 	} default {
-		$___output="${___os}"
+		$___output = "${___os}-"
 	}}
 
 
 	# process arch
 	switch ($___arch) {
 	{ $_ -in "386", "i386", "486", "i486", "586", "i586", "686", "i686" } {
-		$___output = "${___output}-i386"
+		$___output = "${___output}i386"
 	} "mipsle" {
-		$___output = "${___output}-mipsel"
+		$___output = "${___output}mipsel"
 	} "mipsr6le" {
-		$___output = "${___output}-mipsr6el"
+		$___output = "${___output}mipsr6el"
 	} "mips32le" {
-		$___output = "${___output}-mips32el"
+		$___output = "${___output}mips32el"
 	} "mips32r6le" {
-		$___output = "${___output}-mips32r6el"
+		$___output = "${___output}mips32r6el"
 	} "mips64le" {
-		$___output = "${___output}-mips64el"
+		$___output = "${___output}mips64el"
 	} "mips64r6le" {
-		$___output = "${___output}-mips64r6el"
+		$___output = "${___output}mips64r6el"
 	} "powerpcle" {
-		$___output = "${___output}-powerpcel"
+		$___output = "${___output}powerpcel"
 	} "ppc64le" {
-		$___output = "${___output}-ppc64el"
+		$___output = "${___output}ppc64el"
 	} default {
-		$___output = "${___output}-${___arch}"
+		$___output = "${___output}${___arch}"
 	}}
 
 

diff --git a/automataCI/services/compilers/deb.sh b/automataCI/services/compilers/deb.sh
@@ -384,46 +384,49 @@ DEB_Get_Architecture() {
 
         # process os
         case "$1" in
+        linux)
+                ___output=""
+                ;;
         dragonfly)
-                ___output="dragonflybsd"
+                ___output="dragonflybsd-"
                 ;;
         *)
-                ___output="$1"
+                ___output="${1}-"
                 ;;
         esac
 
 
         # process arch
         case "$2" in
         386|i386|486|i486|586|i586|686|i686)
-                ___output="${___output}-i386"
+                ___output="${___output}i386"
                 ;;
         mipsle)
-                ___output="${___output}-mipsel"
+                ___output="${___output}mipsel"
                 ;;
         mipsr6le)
-                ___output="${___output}-mipsr6el"
+                ___output="${___output}mipsr6el"
                 ;;
         mips32le)
-                ___output="${___output}-mips32el"
+                ___output="${___output}mips32el"
                 ;;
         mips32r6le)
-                ___output="${___output}-mips32r6el"
+                ___output="${___output}mips32r6el"
                 ;;
         mips64le)
-                ___output="${___output}-mips64el"
+                ___output="${___output}mips64el"
                 ;;
         mips64r6le)
-                ___output="${___output}-mips64r6el"
+                ___output="${___output}mips64r6el"
                 ;;
         powerpcle)
-                ___output="${___output}-powerpcel"
+                ___output="${___output}powerpcel"
                 ;;
         ppc64le)
-                ___output="${___output}-ppc64el"
+                ___output="${___output}ppc64el"
                 ;;
         *)
-                ___output="${___output}-${2}"
+                ___output="${___output}${2}"
                 ;;
         esac