From 8301af566963c1a627fa74b7b89587a9eacd5d2e Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg@thehellings.com>
Date: Tue, 19 Nov 2024 07:18:36 +0000
Subject: [PATCH] Simplify continuation and go back to echoing.

---
 nix/continue.nix | 42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/nix/continue.nix b/nix/continue.nix
index 9b5fb5b..9a48619 100644
--- a/nix/continue.nix
+++ b/nix/continue.nix
@@ -18,6 +18,11 @@ let
         paths = [ "./packer_config/" ];
       }
     ];
+    variables = {
+      PACKER_CONFIG_DIR = "./packer_config/";
+      PACKER_CACHE_DIR = "./cache/";
+      PACKER_LOG = "1";
+    };
     rules = [
       {
         "if" = "$CI_COMMIT_TAG";
@@ -46,51 +51,28 @@ let
     ];
   };
 
-  variables = {
-    PACKER_CONFIG_DIR = "./packer_config/";
-    PACKER_CACHE_DIR = "./cache/";
-    PACKER_LOG = "1";
-  };
-
   continue = {
     stages = [
       "build"
       "release"
     ];
     "qemu.amd64" = general // {
-      variables = variables // {
-        only = "-only=qemu.amd64";
-      };
       tags = [ "qemu" ];
-      parallel = {
-        matrix = qemu_list;
-      };
-      before_script = [
-        "echo $BUILD"
-        "env"
-      ];
+      parallel.matrix = qemu_list;
     };
     "virtualbox-iso.amd64" = general // {
-      variables = variables // {
-        only = "-only=\"virtualbox-iso.amd64\"";
-      };
       tags = [ "vbox" ];
-      parallel = {
-        matrix = vbox_list;
-      };
+      parallel.matrix = vbox_list;
     };
     "hyperv-iso.amd64" = general // {
-      variables = variables // {
-        only = "-only=\"hyperv-iso.amd64\"";
-      };
       tags = [ "hyperv" ];
-      parallel = {
-        matrix = hyperv_list;
-      };
+      parallel.matrix = hyperv_list;
       script = [
         "packer init sources"
-        "packer build -only=\"hyperv-iso.amd64\" -var-file=\"\${distro}\" -var build=\${BUILD} -var cpus=2 -var memory=4096 \${EXCEPT} sources"
-        "if (-not $?) { throw \"Error in build\" }"
+        "echo packer build -only=\"hyperv-iso.amd64\" -var-file=\"\${distro}\" -var build=\${BUILD} -var cpus=2 -var memory=4096 \${EXCEPT} sources > build.ps1"
+        "echo 'if (-not $?) { throw \"Error in build\" }' >> build.ps1"
+        "cat .\build.ps1"
+        "pwsh .\build.ps1"
       ];
     };
     "Create release" = {