diff options
| author | Rubén Beltrán del Río <jj@r.bdr.sh> | 2026-01-17 17:26:40 +0100 |
|---|---|---|
| committer | Rubén Beltrán del Río <jj@r.bdr.sh> | 2026-01-17 17:26:42 +0100 |
| commit | dc841cafd81b4481f316b3701c7e59dd306806aa (patch) | |
| tree | 5431395de2b3560bf61d5d1c72062278eaf7be23 | |
| parent | dc07125b6adf570411882bbe46a3fe694e3d8c20 (diff) | |
Add flatpak cargo generator and python
| -rw-r--r-- | .builds/aarch64.yml | 21 | ||||
| -rw-r--r-- | .builds/x86_64.yml | 9 |
2 files changed, 23 insertions, 7 deletions
diff --git a/.builds/aarch64.yml b/.builds/aarch64.yml index 896e710..299df18 100644 --- a/.builds/aarch64.yml +++ b/.builds/aarch64.yml @@ -1,4 +1,4 @@ -image: archlinux +image: fedora/43 arch: aarch64 packages: - make @@ -7,15 +7,18 @@ packages: - coreutils - clang - lld - - rustup - tar - gzip - - gtk4 - - libadwaita - - gtksourceview5 + - gtk4-devel + - libadwaita-devel + - gtksourceview5-devel - gettext + - poetry + - flatpak + - flatpak-builder sources: - git@git.sr.ht:~rbdr/map-linux + - https://github.com/flatpak/flatpak-builder-tools environment: GPG_TTY: /dev/pts/0 secrets: @@ -24,6 +27,9 @@ secrets: - f80356df-eb81-487f-8739-fbf08bf204dc - 05763ec6-2f17-46b5-90f6-963482975b8b tasks: + - install_rustup: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + echo 'source $HOME/.cargo/env' >> ~/.buildenv - set_rust: | cd map-linux make set_rust @@ -32,6 +38,9 @@ tasks: - install_builders: | cargo binstall cargo-generate-rpm --no-confirm cargo binstall cargo-deb --no-confirm + - setup_flatpak_tools: | + cd flatpak-builder-tools/cargo + poetry install - release: | cd map-linux - make ci + make -e flatpak_cargo_generator=$(HOME)/flatpak-builder-tools/cargo ci diff --git a/.builds/x86_64.yml b/.builds/x86_64.yml index b46bab7..3496ead 100644 --- a/.builds/x86_64.yml +++ b/.builds/x86_64.yml @@ -14,8 +14,12 @@ packages: - libadwaita - gtksourceview5 - gettext + - python-poetry + - flatpak + - flatpak-builder sources: - git@git.sr.ht:~rbdr/map-linux + - https://github.com/flatpak/flatpak-builder-tools environment: GPG_TTY: /dev/pts/0 secrets: @@ -32,6 +36,9 @@ tasks: - install_builders: | cargo binstall cargo-generate-rpm --no-confirm cargo binstall cargo-deb --no-confirm + - setup_flatpak_tools: | + cd flatpak-builder-tools/cargo + poetry install - release: | cd map-linux - make ci + make -e flatpak_cargo_generator=$(HOME)/flatpak-builder-tools/cargo ci |