From 2d124c652ae4da7ff35b5ea9b72bd56b9a8062af Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 24 Jun 2024 23:13:53 -0500
Subject: [PATCH] Move validate step into Nix script

---
 .gitlab-ci.yml |  9 +++------
 flake.nix      | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d125939..d79abb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,8 @@ distros:
 
 validate:
   stage: lint
+  tags:
+    - nix
   needs:
     - generate
   cache:
@@ -42,12 +44,7 @@ validate:
           - sources/build.pkr.hcl
       paths:
         - ./packer_config/
-  script: |-
-    set -exo pipefail
-    packer init sources
-    for vars in $(find distros/ -name '*.pkrvars.hcl'); do
-      packer validate -except=upload -var-file=${vars} sources/
-    done
+  script: nix run ".#validate"
 
 shellcheck:
   stage: lint
diff --git a/flake.nix b/flake.nix
index a04ec48..897a912 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,10 @@
 					package = self'.packages.shellcheck;
 					category = "utils";
 					help = "Run shellchecks";
+				} {
+					package = self'.packages.validate;
+					category = "utils";
+					help = "Validate all the files";
 				} ];
 			};
 
@@ -80,6 +84,19 @@
 						shellcheck -e SC2239 "''${scripts[@]}"
 					'';
 				};
+				validate = pkgs.writeShellApplication {
+					name = "validate";
+					runtimeInputs = with pkgs; [
+						packer
+					];
+					text = ''
+						shopt -s globstar
+						packer init sources
+						for vars in distros/**/*.pkrvars.hcl; do
+							packer validate -except=upload "-var-file=''${vars}" sources/
+						done
+					'';
+				};
 			};
 
 			# https://numtide.github.io/treefmt/