lib/VERSION

@@ -1 +1 @@
-3.0.0-alpha.2
+3.0.0-alpha.1

lib/impl/jobPatched.nix

@@ -11,33 +11,21 @@ in
     pipelineName,
     nixConfig,
   }:
-    (builtins.removeAttrs job ["variables" "cache"])
+    job
     // (optionalAttrs nixConfig.enable (
       (prependToBeforeScript ["source setup_nix_ci \"gitlab-ci:pipeline:${pipelineName}:job-deps:${key}\""] job)
       // (appendToAfterScript ["finalize_nix_ci"] job)
     ))
-    // optionalAttrs nixConfig.enable (
+    // optionalAttrs nixConfig.enable {
-      (let
+      variables =
-        variables =
+        (filterJobVariables false job)
-          (filterJobVariables false job)
+        // optionalAttrs nixConfig.enableRunnerCache {
-          // optionalAttrs nixConfig.enableRunnerCache {
+          NIX_CI_CACHE_STRATEGY = "runner";
-            NIX_CI_CACHE_STRATEGY = "runner";
+        };
-          };
+      cache =
-      in
+        (toList (job.cache or []))
-        # filter empty variables
+        ++ (optional nixConfig.enableRunnerCache {
-        optionalAttrs (variables != {}) {
+          key = nixConfig.runnerCacheKey;
-          inherit variables;
+          paths = [".nix-cache/"];
-        })
+        });
-      // (let
+    }
-        cache =
-          (toList (job.cache or []))
-          ++ (optional nixConfig.enableRunnerCache {
-            key = nixConfig.runnerCacheKey;
-            paths = [".nix-cache/"];
-          });
-      in
-        # filter empty cache
-        optionalAttrs (cache != []) {
-          inherit cache;
-        })
-    )

nix/repo/ci.nix

@@ -64,6 +64,10 @@ in
           script = [
             "nix run .#tests -- --junit=junit.xml"
           ];
+          variables = {
+            "SSL_CERT_FILE" = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+            "NIX_SSL_CERT_FILE" = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+          };
           allow_failure = true;
           artifacts = {
             when = "always";

tests/cilib_test.nix

@@ -148,7 +148,10 @@
         name = "handle store paths in variables";
         expected = {
           stages = ["test"];
-          test.stage = "test";
+          test = {
+            stage = "test";
+            variables."TEST" = "${pkgs.hello}";
+          };
         };
         actual =
           (mkPipeline {

tests/flake_parts_test.nix

@@ -14,8 +14,6 @@
           ''
             ${ntlib.helpers.scriptHelpers}
             ${ntlib.helpers.path (with pkgs; [coreutils nix gnused gnugrep jq])}
-            export SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt
-            export NIX_SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt
             repo_path=${../.}
 
             cp ${./fixtures/flake_parts}/* .