Move more commands into nix

.gitlab-ci.yml

@@ -9,16 +9,15 @@ variables:
 
 default:
   image: registry.thehellings.com/greg/ci-images/vm-test:latest
+  tags:
+    - nix
 
 generate:
   stage: generate
   artifacts:
     paths:
       - distros/**/*.pkrvars.hcl
-  script: |-
-    for vars in $(find distros/ -name '*.pkrvars.hcl.sh'); do
-      bash "./${vars}"
-    done
+  script: nix build ".#generate"
 
 continue:
   stage: generate
@@ -27,8 +26,6 @@ continue:
       dotenv: build.env
     paths:
       - .gitlab-ci-build.yml
-  tags:
-    - nix
   script:
     - nix build ".#continue"
     - cp result .gitlab-ci-build.yml
@@ -36,14 +33,10 @@ continue:
 
 shellcheck:
   stage: generate
-  tags:
-    - nix
   script: nix run ".#shellcheck"
 
 validate:
   stage: check
-  tags:
-    - nix
   needs:
     - generate
   cache:
@@ -59,8 +52,6 @@ validate:
 downloads:
   stage: check
   retry: 2
-  tags:
-    - nix
   needs:
     - generate
   cache:
@@ -69,8 +60,7 @@ downloads:
           - sources/build.pkr.hcl
       paths:
         - ./packer_config/
-  script:
-    - nix run ".#cache"
+  script: nix run ".#cache"
 
 trigger:
   stage: trigger