Forward channel, clean_images and flatpak_cargo_generator

Eventually this logic will need to change.

2 files changed, 16 insertions, 16 deletions

diff --git a/README.md b/README.md
index 7daaa1d..cb0cad9 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ For a quick local install without packaging:
 * `just install` - installs using meson's install command. Might require `sudo`.
 * `just uninstall` - removes installed files
 
-To install to a different prefix: `just install prefix=/opt/map`
+To install to a different prefix use the meson tooling directly.
 
 ## Code Quality
 
@@ -60,7 +60,7 @@ configurable via the justfile. The defaults are:
 
 ## Distributing
 
-Available package formats: deb, rpm, tar.gz, flatpak.
+Available package formats: deb, rpm, arch pkg.tar.gz, flatpak, and AppImage.
 
 ### Main Targets
 
@@ -78,17 +78,17 @@ For more control, use individual package or distribute targets:
 * `just package-appimage` - create .AppImage archive
 * `just package-flatpak` - create .flatpak bundle
 
-* `just distribute-deb-all` - sign and upload .deb
-* `just distribute-rpm-all` - sign and upload .rpm
+For `.deb` targets we build for `trixie`, `forky`, and `sid` while for `.rpm`
+targets we build for `fedora43`, `fedora44`, and `fedora-rawhide`. You can build
+individual packages by running `just package-deb DISTRO` or
+`just package-rpm DISTRO`
+
+* `just distribute-deb` - sign and upload .deb
+* `just distribute-rpm` - sign and upload .rpm
 * `just distribute-arch` - sign and upload .pkg.tar.gz package
 * `just distribute-appimage` - sign and upload .AppImage
 * `just distribute-flatpak` - sign and upload .flatpak
 
-For `.deb` targets we build for `trixie` and `forky`, while for `.rpm` targets
-we build for `fedora43`, `fedora44`, and `fedora-rawhide`. You can build
-individual packages by running `just package-deb DISTRO` or
-`just package-rpm DISTRO`
-
 ### Flatpak Notes
 
 Since flatpak expects offline building, we use `flatpak-cargo-generator` to
diff --git a/justfile b/justfile
index 4ef4b5b..9a3de94 100644
--- a/justfile
+++ b/justfile
@@ -79,7 +79,7 @@ build-container name:
 
 # Builds all containers
 build-containers:
-  for container in {{all_containers}}; do just build-container "$container"; done
+  for container in {{all_containers}}; do just container_image_prefix={{container_image_prefix}} clean_images={{clean_images}} build-container "$container"; done
 
 # Packaging ####################################################################
 
@@ -190,11 +190,11 @@ package-deb distro: _ensure-distdir (build-container distro) dist && (_clean-ima
 
 # Build .rpm for every supported distro
 package-rpm-all:
-  for distro in {{fedora_versions}}; do just package-rpm "$distro"; done
+  for distro in {{fedora_versions}}; do just clean_images={{clean_images}} channel={{channel}} package-rpm "$distro"; done
 
 # Build .deb for every supported distro
 package-deb-all:
-  for distro in {{debian_versions}}; do just package-deb "$distro"; done
+  for distro in {{debian_versions}}; do just clean_images={{clean_images}} channel={{channel}} package-deb "$distro"; done
 
 # Build all distributable packages
 package: package-flatpak package-appimage package-arch package-rpm-all package-deb-all
@@ -212,11 +212,11 @@ distribute-arch: (_sign-and-upload f"{{distdir}}/{{filename}}-arch.pkg.tar.gz")
 
 # Sign and upload .rpm files
 distribute-rpm:
-  for distro in {{fedora_versions}}; do just _distribute-rpm "$distro"; done
+  for distro in {{fedora_versions}}; do just _distribute-rpm channel={{channel}} "$distro"; done
 
 # Sign and upload .deb files
 distribute-deb:
-  for distro in {{debian_versions}}; do just _distribute-deb "$distro"; done
+  for distro in {{debian_versions}}; do just _distribute-deb channel={{channel}} "$distro"; done
 
 # Sign and upload all distributable packages
 distribute: distribute-flatpak distribute-appimage distribute-arch distribute-rpm distribute-deb
@@ -236,9 +236,9 @@ release: package distribute
 ci: lint
   #!/usr/bin/env bash
   if [[ "$GIT_REF" == "refs/heads/main" ]]; then
-    just release
+    just clean_images={{clean_images}} flatpak_cargo_generator={{flatpak_cargo_generator}} release
   elif [[ "$GIT_REF" == refs/tags/* ]]; then
-    just channel="${GIT_REF#refs/tags/}" release
+    just clean_images={{clean_images}} flatpak_cargo_generator={{flatpak_cargo_generator}} channel="${GIT_REF#refs/tags/}" release
   else
     echo "Not in CI environment."
   fi