From d243a0f5bd93b8fb1c1f86a2084173004ef86623 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 22 Jul 2024 10:34:22 -0500
Subject: [PATCH] Be capable of running build vs upload

---
 .gitlab-ci-build.yml.in | 4 +++-
 flake.nix               | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci-build.yml.in b/.gitlab-ci-build.yml.in
index 2849ac3..9aca7a0 100644
--- a/.gitlab-ci-build.yml.in
+++ b/.gitlab-ci-build.yml.in
@@ -15,9 +15,11 @@ stages:
     - if: $CI_COMMIT_TAG
       variables:
         EXCEPT: ''
+        JOB_PREFIX: 'ci'
     - if: $CI_COMMIT_TAG =~ "/^$/"
       variables:
         EXCEPT: '-except=upload'
+        JOB_PREIX: 'upload'
   needs:
     - pipeline: $PARENT_PIPELINE_ID
       job: continue
@@ -32,7 +34,7 @@ stages:
     PACKER_CACHE_DIR: ./cache/
     PACKER_LOG: 1
   script:
-    - nix run ".#\"${buildcmd}\"" || exit 1
+    - nix run ".#\"${JOB_PREIX}${buildcmd}\"" || exit 1
 
 qemu.amd64:
   extends: .build
diff --git a/flake.nix b/flake.nix
index 4912db9..619e3cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -131,8 +131,8 @@
 				builds = lib.lists.foldr (d: acc: acc // { "build${name d}" = (build d); }) {} withProviders;
 				uploads = lib.lists.foldr (d: acc: acc // { "upload${name d}" = (upload d); }) {} withProviders;
 				cibuilds = lib.lists.foldr (d: acc: acc // { "ci${name d}" = (cibuild d); }) {} withProviders;
-				qemu_list = builtins.toJSON (builtins.map (d: { buildcmd = "ci${name d}"; }) (builtins.filter (x: x.provider == "qemu") active));
-				vbox_list = builtins.toJSON (builtins.map (d: { buildcmd = "ci${name d}"; }) (builtins.filter (x: x.provider == "virtualbox-iso") active));
+				qemu_list = builtins.toJSON (builtins.map (d: { buildcmd = (name d); }) (builtins.filter (x: x.provider == "qemu") active));
+				vbox_list = builtins.toJSON (builtins.map (d: { buildcmd = (name d); }) (builtins.filter (x: x.provider == "virtualbox-iso") active));
 				hyperv_list = builtins.toJSON (builtins.map (d: { distro = distroFile d; }) (builtins.filter (x: x.provider == "hyperv-iso") active));
 			in builds // uploads // cibuilds // {
 				continue = pkgs.writeText "continue.yml"