packages yum: add a suffix of package name for discriminating between…

… x86_64 and aarch64
komainu8 · Jan 29, 2022 · 5158b87 · 5158b87
1 parent 6093559
commit 5158b87
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -78,7 +78,7 @@ jobs:
           - Debian GNU/Linux buster amd64
           - Debian GNU/Linux buster arm64
           - Debian GNU/Linux buster i386
-          - CentOS 7
+          - CentOS 7 x86_64
           - AlmaLinux 8 x86_64
           - AlmaLinux 8 aarch64
         include:
@@ -107,8 +107,8 @@ jobs:
             task-namespace: apt
             target: debian-buster-i386
             test-docker-image: i386/debian:buster
-          - label: CentOS 7
-            id: centos-7
+          - label: CentOS 7 x86_64
+            id: centos-7-x86_64
             task-namespace: yum
             target: centos-7
             test-docker-image: centos:7

diff --git a/packages/Rakefile b/packages/Rakefile
@@ -125,7 +125,11 @@ class GroongaPackageTask < PackagesGroongaOrgPackageTask
         "packages-#{target}-amd64"
       end
     when :yum
-      "packages-#{target}"
+      if target.end_with?("-aarch64")
+        "packages-#{target}"
+      else
+        "packages-#{target}-x86_64"
+      end
     else
       raise NotImplementedError
     end
@@ -140,6 +144,12 @@ class GroongaPackageTask < PackagesGroongaOrgPackageTask
       else
         url << "#{target}-amd64.tar.gz"
       end
+    when :yum
+      if target.end_with?("-aarch64")
+        url << "#{target}.tar.gz"
+      else
+        url << "#{target}-x86_64.tar.gz"
+      end
     when :windows
       url << "#{target}"
     else