From 0ef6f4d2ff91ec41ef845ca506934c0492538e7b Mon Sep 17 00:00:00 2001
From: Skryta Istota <6970043-hidden-being@users.noreply.gitlab.com>
Date: Wed, 3 Dec 2025 16:35:45 +0100
Subject: [PATCH] rollback(jobPatched) Restored some features for patching jobs
 for ci

Tests for this filtering of environment variables in ci have also been rollback.
---
 lib/impl/jobPatched.nix | 4 ++--
 nix/repo/ci.nix         | 1 -
 tests/cilib_test.nix    | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/impl/jobPatched.nix b/lib/impl/jobPatched.nix
index 2467ae6..367a374 100644
--- a/lib/impl/jobPatched.nix
+++ b/lib/impl/jobPatched.nix
@@ -3,7 +3,7 @@
   helpers,
 }: let
   inherit (lib) toList optionalAttrs optional;
-  inherit (helpers) prependToBeforeScript appendToAfterScript;
+  inherit (helpers) prependToBeforeScript appendToAfterScript filterJobVariables;
 in
   {
     key,
@@ -19,7 +19,7 @@ in
       // (appendToAfterScript ["finalize_nix_ci"] job)
       // (let
         variables =
-          job.variables or {}
+          (filterJobVariables false job)
           // optionalAttrs nixConfig.enableRunnerCache {
             NIX_CI_CACHE_STRATEGY = "runner";
           };
diff --git a/nix/repo/ci.nix b/nix/repo/ci.nix
index 634305d..9ef9aac 100644
--- a/nix/repo/ci.nix
+++ b/nix/repo/ci.nix
@@ -73,7 +73,6 @@ in
           variables = {
             SAMPLE = "working";
             HELLO = toString pkgs.hello;
-            FF_SCRIPT_SECTIONS = "true";
           };
         };
         "test" = {
diff --git a/tests/cilib_test.nix b/tests/cilib_test.nix
index a46d24a..1661c8c 100644
--- a/tests/cilib_test.nix
+++ b/tests/cilib_test.nix
@@ -88,7 +88,7 @@
           after_script = ["finalize_nix_ci"];
           before_script = ["source setup_nix_ci \"gitlab-ci:pipeline:test:job-deps:test\""];
           variables = {
-            BASH = toString pkgs.bash;
+            #BASH = toString pkgs.bash;
             TEST = "work";
           };
           cache = [
@@ -134,7 +134,7 @@
           ];
           variables = {
             NIX_CI_CACHE_STRATEGY = "runner";
-            BASH = toString pkgs.bash;
+            #BASH = toString pkgs.bash;
             TEST = "work";
           };
         };
@@ -273,7 +273,7 @@
             ];
             variables = {
               SAMPLE = "working";
-              HELLO = toString pkgs.hello;
+              #HELLO = toString pkgs.hello;
               NIX_CI_CACHE_STRATEGY = "runner";
             };
           };