Use podman to build all instead

7 files changed, 8 insertions, 238 deletions

diff --git a/.builds/x86_64_arch.yml b/.builds/x86_64_arch.yml
index 3dad0f4..3b90e37 100644
--- a/.builds/x86_64_arch.yml
+++ b/.builds/x86_64_arch.yml
@@ -18,6 +18,7 @@ packages:
   - libadwaita
   - gtksourceview5
   - fakeroot
+  - podman
 sources:
   - git@git.sr.ht:~rbdr/map-linux
   - https://github.com/flatpak/flatpak-builder-tools
@@ -39,9 +40,11 @@ tasks:
       poetry install
   - setup_flathub: |
       flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-  - release_arch: |
+  - release: |
       cd map-linux
-      make -e target=x86_64-unknown-linux-gnu -e flatpak_cargo_generator=/home/build/flatpak-builder-tools/cargo ci-arch
-  - release_generic: |
-      cd map-linux
-      make -e target=x86_64-unknown-linux-gnu -e flatpak_cargo_generator=/home/build/flatpak-builder-tools/cargo ci-generic
+      if [ "$GIT_REF" = "refs/heads/main" ]; then
+        make -e target=x86_64-unknown-linux-gnu -e channel=unstable -e flatpak_cargo_generator=/home/build/flatpak-builder-tools/cargo release
+      elif echo "$GIT_REF" | grep -q "refs/tags/"; then
+        channel=$(echo "$GIT_REF" | sed 's|refs/tags/||')
+        make -e target=x86_64-unknown-linux-gnu -e channel=$channel -e flatpak_cargo_generator=/home/build/flatpak-builder-tools/cargo release
+      fi
diff --git a/.builds/x86_64_debian_oldstable.yml b/.builds/x86_64_debian_oldstable.yml
deleted file mode 100644
index b0c0829..0000000
--- a/.builds/x86_64_debian_oldstable.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# NOTE: Debian oldstable (bullseye) may not have libadwaita available.
-# This build might fail. Consider removing if bullseye support isn't needed.
-image: debian/oldstable
-packages:
-  - make
-  - minisign
-  - rsync
-  - coreutils
-  - clang
-  - lld
-  - curl
-  - tar
-  - gzip
-  - gettext
-  - libgtk-4-dev
-  - libadwaita-1-dev
-  - libgtksourceview-5-dev
-  - pkg-config
-sources:
-  - git@git.sr.ht:~rbdr/map-linux
-environment:
-  GPG_TTY: /dev/pts/0
-  CARGO_HOME: /home/build/.cargo
-  PATH: /home/build/.cargo/bin:/usr/local/bin:/usr/bin:/bin
-secrets:
-  - a1e0e3da-c1ad-473a-ad69-8878f267a628
-  - eaecf3b4-a508-4fa6-a36e-6b9ed4468eae
-  - f80356df-eb81-487f-8739-fbf08bf204dc
-  - 05763ec6-2f17-46b5-90f6-963482975b8b
-tasks:
-  - install_rust: |
-      curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-      source ~/.cargo/env
-  - install_binstall: |
-      source ~/.cargo/env
-      curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-  - install_builders: |
-      source ~/.cargo/env
-      cargo binstall cargo-deb --no-confirm
-  - release: |
-      source ~/.cargo/env
-      cd map-linux
-      make -e target=x86_64-unknown-linux-gnu -e distro=bullseye ci-deb
diff --git a/.builds/x86_64_debian_stable.yml b/.builds/x86_64_debian_stable.yml
deleted file mode 100644
index 32900e5..0000000
--- a/.builds/x86_64_debian_stable.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-image: debian/stable
-packages:
-  - make
-  - minisign
-  - rsync
-  - coreutils
-  - clang
-  - lld
-  - curl
-  - tar
-  - gzip
-  - gettext
-  - libgtk-4-dev
-  - libadwaita-1-dev
-  - libgtksourceview-5-dev
-  - pkg-config
-sources:
-  - git@git.sr.ht:~rbdr/map-linux
-environment:
-  GPG_TTY: /dev/pts/0
-  CARGO_HOME: /home/build/.cargo
-  PATH: /home/build/.cargo/bin:/usr/local/bin:/usr/bin:/bin
-secrets:
-  - a1e0e3da-c1ad-473a-ad69-8878f267a628
-  - eaecf3b4-a508-4fa6-a36e-6b9ed4468eae
-  - f80356df-eb81-487f-8739-fbf08bf204dc
-  - 05763ec6-2f17-46b5-90f6-963482975b8b
-tasks:
-  - install_rust: |
-      curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-      source ~/.cargo/env
-  - install_binstall: |
-      source ~/.cargo/env
-      curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-  - install_builders: |
-      source ~/.cargo/env
-      cargo binstall cargo-deb --no-confirm
-  - release: |
-      source ~/.cargo/env
-      cd map-linux
-      make -e target=x86_64-unknown-linux-gnu -e distro=bookworm ci-deb
diff --git a/.builds/x86_64_debian_testing.yml b/.builds/x86_64_debian_testing.yml
deleted file mode 100644
index d01fa9e..0000000
--- a/.builds/x86_64_debian_testing.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-image: debian/testing
-packages:
-  - make
-  - minisign
-  - rsync
-  - coreutils
-  - clang
-  - lld
-  - curl
-  - tar
-  - gzip
-  - gettext
-  - libgtk-4-dev
-  - libadwaita-1-dev
-  - libgtksourceview-5-dev
-  - pkg-config
-sources:
-  - git@git.sr.ht:~rbdr/map-linux
-environment:
-  GPG_TTY: /dev/pts/0
-  CARGO_HOME: /home/build/.cargo
-  PATH: /home/build/.cargo/bin:/usr/local/bin:/usr/bin:/bin
-secrets:
-  - a1e0e3da-c1ad-473a-ad69-8878f267a628
-  - eaecf3b4-a508-4fa6-a36e-6b9ed4468eae
-  - f80356df-eb81-487f-8739-fbf08bf204dc
-  - 05763ec6-2f17-46b5-90f6-963482975b8b
-tasks:
-  - install_rust: |
-      curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-      source ~/.cargo/env
-  - install_binstall: |
-      source ~/.cargo/env
-      curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-  - install_builders: |
-      source ~/.cargo/env
-      cargo binstall cargo-deb --no-confirm
-  - release: |
-      source ~/.cargo/env
-      cd map-linux
-      make -e target=x86_64-unknown-linux-gnu -e distro=trixie ci-deb
diff --git a/.builds/x86_64_fedora42.yml b/.builds/x86_64_fedora42.yml
deleted file mode 100644
index 0f9aac9..0000000
--- a/.builds/x86_64_fedora42.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-image: fedora/42
-packages:
-  - make
-  - minisign
-  - rsync
-  - coreutils
-  - clang
-  - lld
-  - rustup
-  - curl
-  - tar
-  - gzip
-  - gettext
-  - gtk4-devel
-  - libadwaita-devel
-  - gtksourceview5-devel
-sources:
-  - git@git.sr.ht:~rbdr/map-linux
-environment:
-  GPG_TTY: /dev/pts/0
-secrets:
-  - a1e0e3da-c1ad-473a-ad69-8878f267a628
-  - eaecf3b4-a508-4fa6-a36e-6b9ed4468eae
-  - f80356df-eb81-487f-8739-fbf08bf204dc
-  - 05763ec6-2f17-46b5-90f6-963482975b8b
-tasks:
-  - set_rust: |
-      cd map-linux
-      make set_rust
-  - install_binstall: |
-      curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-  - install_builders: |
-      cargo binstall cargo-generate-rpm --no-confirm
-  - release: |
-      cd map-linux
-      make -e target=x86_64-unknown-linux-gnu -e distro=fedora42 ci-rpm
diff --git a/.builds/x86_64_fedora43.yml b/.builds/x86_64_fedora43.yml
deleted file mode 100644
index 77e9c95..0000000
--- a/.builds/x86_64_fedora43.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-image: fedora/43
-packages:
-  - make
-  - minisign
-  - rsync
-  - coreutils
-  - clang
-  - lld
-  - rustup
-  - curl
-  - tar
-  - gzip
-  - gettext
-  - gtk4-devel
-  - libadwaita-devel
-  - gtksourceview5-devel
-sources:
-  - git@git.sr.ht:~rbdr/map-linux
-environment:
-  GPG_TTY: /dev/pts/0
-secrets:
-  - a1e0e3da-c1ad-473a-ad69-8878f267a628
-  - eaecf3b4-a508-4fa6-a36e-6b9ed4468eae
-  - f80356df-eb81-487f-8739-fbf08bf204dc
-  - 05763ec6-2f17-46b5-90f6-963482975b8b
-tasks:
-  - set_rust: |
-      cd map-linux
-      make set_rust
-  - install_binstall: |
-      curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-  - install_builders: |
-      cargo binstall cargo-generate-rpm --no-confirm
-  - release: |
-      cd map-linux
-      make -e target=x86_64-unknown-linux-gnu -e distro=fedora43 ci-rpm
diff --git a/.builds/x86_64_fedora_rawhide.yml b/.builds/x86_64_fedora_rawhide.yml
deleted file mode 100644
index 14ba738..0000000
--- a/.builds/x86_64_fedora_rawhide.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-image: fedora/rawhide
-packages:
-  - make
-  - minisign
-  - rsync
-  - coreutils
-  - clang
-  - lld
-  - rustup
-  - curl
-  - tar
-  - gzip
-  - gettext
-  - gtk4-devel
-  - libadwaita-devel
-  - gtksourceview5-devel
-sources:
-  - git@git.sr.ht:~rbdr/map-linux
-environment:
-  GPG_TTY: /dev/pts/0
-secrets:
-  - a1e0e3da-c1ad-473a-ad69-8878f267a628
-  - eaecf3b4-a508-4fa6-a36e-6b9ed4468eae
-  - f80356df-eb81-487f-8739-fbf08bf204dc
-  - 05763ec6-2f17-46b5-90f6-963482975b8b
-tasks:
-  - set_rust: |
-      cd map-linux
-      make set_rust
-  - install_binstall: |
-      curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-  - install_builders: |
-      cargo binstall cargo-generate-rpm --no-confirm
-  - release: |
-      cd map-linux
-      make -e target=x86_64-unknown-linux-gnu -e distro=fedora-rawhide ci-rpm