Merge branch 'develop' of github.com:upmaru/pakman into develop

upmaru · Oct 21, 2023 · 07ad8ca · 07ad8ca
2 parents 130520d + 5af7b8a
commit 07ad8ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/pakman/templates/bootstrap/apkbuild.eex b/lib/pakman/templates/bootstrap/apkbuild.eex
@@ -2,7 +2,7 @@ pkgname="<%= name %>"
 pkgver="<%= version %>"
 pkgrel="<%= build %>"
 pkgdesc="<%= name %>"
-arch="x86_64"
+arch="<%= if configuration["architectures"], do: Enum.join(configuration["architectures"], " "), else: "x86_64" %>"
 options="<%= Enum.join(configuration["options"], " ") %>"
 pkgusers="<%= name %>"
 pkggroups="<%= name %>"

diff --git a/test/fixtures/rails.yml b/test/fixtures/rails.yml
@@ -19,6 +19,10 @@ dependencies:
 
 stack: alpine/3.17
 
+architectures:
+  - x86_64
+  - aarch64
+
 build:
   destinations: 
     - '*'
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,10 @@ dependencies: @@
     stack: alpine/3.17
+    architectures:
+      - x86_64
+      - aarch64
     build:
       destinations:
         - '*'
@@ Expand Down @@