From 82ea1228dcc7f4d088043493512fa8f3a40bfb52 Mon Sep 17 00:00:00 2001
From: Ruben Beltran del Rio <git@r.bdr.sh>
Date: Sat, 16 Mar 2024 23:27:47 +0100
Subject: Attempt multiple builds instead of cross-compiling

---
 .build.yml          | 37 -------------------------------------
 .builds/aarch64.yml | 28 ++++++++++++++++++++++++++++
 .builds/x86_64.yml  | 28 ++++++++++++++++++++++++++++
 Makefile            |  4 ++--
 4 files changed, 58 insertions(+), 39 deletions(-)
 delete mode 100644 .build.yml
 create mode 100644 .builds/aarch64.yml
 create mode 100644 .builds/x86_64.yml

diff --git a/.build.yml b/.build.yml
deleted file mode 100644
index 8f95303..0000000
--- a/.build.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-image: archlinux
-packages:
-  - make
-  - rsync
-  - coreutils
-  - clang
-  - lld
-  - rustup
-  - aarch64-linux-gnu-gcc
-  - tar
-  - gzip
-  - wget
-  - pod2man
-sources:
-  - git@git.sr.ht:~rbdr/lyricli
-secrets:
-  - 89d3b676-25d6-4942-8231-38b73aa62bf6
-  - 0b0d3e5e-fbdc-41d0-97ed-ee654fe797ff
-  - a802b200-167c-4926-b013-45b238e1261e
-tasks:
-  - prepare_openssl: |
-      wget https://www.openssl.org/source/openssl-3.2.1.tar.gz
-      tar xzvf openssl-3.2.1.tar.gz
-      cd openssl-3.2.1
-      ./Configure linux-aarch64 --prefix=/usr/local/aarch64-linux-gnu --openssldir=/usr/local/aarch64-linux-gnu/ssl --cross-compile-prefix=aarch64-linux-gnu- -static
-      make
-      sudo make install
-  - set_rust: |
-      cd lyricli
-      make set_rust
-  - install_builders: |
-      cargo install cargo-generate-rpm
-      cargo install cargo-deb
-  - package: |
-      cp ~/.env lyricli/.env
-      cd lyricli
-      make ci
diff --git a/.builds/aarch64.yml b/.builds/aarch64.yml
new file mode 100644
index 0000000..41a5ce2
--- /dev/null
+++ b/.builds/aarch64.yml
@@ -0,0 +1,28 @@
+image: fedora/rawhide
+arch: x86_64
+packages:
+  - make
+  - rsync
+  - coreutils
+  - clang
+  - lld
+  - rustup
+  - tar
+  - gzip
+sources:
+  - git@git.sr.ht:~rbdr/lyricli
+secrets:
+  - 89d3b676-25d6-4942-8231-38b73aa62bf6
+  - 0b0d3e5e-fbdc-41d0-97ed-ee654fe797ff
+  - a802b200-167c-4926-b013-45b238e1261e
+tasks:
+  - set_rust: |
+      cd lyricli
+      make set_rust
+  - install_builders: |
+      cargo install cargo-generate-rpm
+      cargo install cargo-deb
+  - package: |
+      cp ~/.env lyricli/.env
+      cd lyricli
+      make ci
diff --git a/.builds/x86_64.yml b/.builds/x86_64.yml
new file mode 100644
index 0000000..41a5ce2
--- /dev/null
+++ b/.builds/x86_64.yml
@@ -0,0 +1,28 @@
+image: fedora/rawhide
+arch: x86_64
+packages:
+  - make
+  - rsync
+  - coreutils
+  - clang
+  - lld
+  - rustup
+  - tar
+  - gzip
+sources:
+  - git@git.sr.ht:~rbdr/lyricli
+secrets:
+  - 89d3b676-25d6-4942-8231-38b73aa62bf6
+  - 0b0d3e5e-fbdc-41d0-97ed-ee654fe797ff
+  - a802b200-167c-4926-b013-45b238e1261e
+tasks:
+  - set_rust: |
+      cd lyricli
+      make set_rust
+  - install_builders: |
+      cargo install cargo-generate-rpm
+      cargo install cargo-deb
+  - package: |
+      cp ~/.env lyricli/.env
+      cd lyricli
+      make ci
diff --git a/Makefile b/Makefile
index d8a7b62..07cc42f 100644
--- a/Makefile
+++ b/Makefile
@@ -73,9 +73,9 @@ endif
 
 ci:
 ifeq ($(GIT_REF),refs/heads/main)
-	$(MAKE) -e profile=release -e channel=unstable package
+	$(MAKE) -e profile=release -e channel=unstable $(target)
 else ifneq (,$(findstring refs/tags/,$(GIT_REF)))
-	$(MAKE) -e profile=release -e channel=$(subst refs/tags/,,$(GIT_REF)) package
+	$(MAKE) -e profile=release -e channel=$(subst refs/tags/,,$(GIT_REF)) $(target)
 endif
 
 .PHONY: default build $(architectures) rpm package prepare set_rust ci release
-- 
cgit