Forward channel, clean_images and flatpak_cargo_generator

Eventually this logic will need to change.

1 files changed, 7 insertions, 7 deletions

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