From: Ruben Beltran del Rio Date: Sat, 16 Mar 2024 22:27:47 +0000 (+0100) Subject: Attempt multiple builds instead of cross-compiling X-Git-Tag: 3.0.0~6 X-Git-Url: https://git.r.bdr.sh/rbdr/lyricli/commitdiff_plain/82ea1228dcc7f4d088043493512fa8f3a40bfb52?ds=inline 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 8f95303..41a5ce2 100644 --- a/.build.yml +++ b/.builds/aarch64.yml @@ -1,4 +1,5 @@ -image: archlinux +image: fedora/rawhide +arch: x86_64 packages: - make - rsync @@ -6,11 +7,8 @@ packages: - clang - lld - rustup - - aarch64-linux-gnu-gcc - tar - gzip - - wget - - pod2man sources: - git@git.sr.ht:~rbdr/lyricli secrets: @@ -18,13 +16,6 @@ secrets: - 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 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