Attempt multiple builds instead of cross-compiling

diff --git a/.build.yml b/.builds/aarch64.yml
similarity index 54%
rename from .build.yml
rename to .builds/aarch64.yml
index 8f9530354e53af28b41cf656754d23d32a8ccefe..41a5ce27a20eca84ee456128525f88d18665736a 100644 (file)
--- a/.build.yml
+++ b/.builds/aarch64.yml
@@ -1,4 +1,5 @@
-image: archlinux
+image: fedora/rawhide
+arch: x86_64

 packages:
   - make
   - rsync
 packages:
   - make
   - rsync


@@ -6,11 +7,8 @@ packages:
   - clang
   - lld
   - rustup
   - clang
   - lld
   - rustup

-  - aarch64-linux-gnu-gcc

   - tar
   - gzip
   - tar
   - gzip

-  - wget
-  - pod2man

 sources:
   - git@git.sr.ht:~rbdr/lyricli
 secrets:
 sources:
   - git@git.sr.ht:~rbdr/lyricli
 secrets:


@@ -18,13 +16,6 @@ secrets:
   - 0b0d3e5e-fbdc-41d0-97ed-ee654fe797ff
   - a802b200-167c-4926-b013-45b238e1261e
 tasks:
   - 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
   - set_rust: |
       cd lyricli
       make set_rust

diff --git a/.builds/x86_64.yml b/.builds/x86_64.yml
new file mode 100644 (file)
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 d8a7b6260da6e557ec071ded713297baba2eaedc..07cc42f01d45e60f465f3d1e026eae602a7eba71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -73,9 +73,9 @@ endif
 
 ci:
 ifeq ($(GIT_REF),refs/heads/main)
 
 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)))
 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
 endif
 
 .PHONY: default build $(architectures) rpm package prepare set_rust ci release