Merge pull request fluidattacks#1356 from dsalaza4/dsalazaratfluid

feat(back): fluidattacks#1355 increase git depth
dsalaza4 · Jul 25, 2024 · 4e2e7ab · 4e2e7ab
2 parents d18f692 + 14ee39d
commit 4e2e7ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/cli/main/cli.py b/src/cli/main/cli.py
@@ -91,7 +91,7 @@
     CON.out("Using feature flag: MAKES_AWS_BATCH_COMPAT")
     CON.out()
 
-GIT_DEPTH: int = int(environ.get("MAKES_GIT_DEPTH", "1"))
+GIT_DEPTH: int = int(environ.get("MAKES_GIT_DEPTH", "3"))
 if GIT_DEPTH != 1:
     CON.out(f"Using feature flag: MAKES_GIT_DEPTH={GIT_DEPTH}")
 

diff --git a/src/evaluator/modules/pipelines/default.nix b/src/evaluator/modules/pipelines/default.nix
@@ -10,10 +10,6 @@ let
         default = [ ];
         type = lib.types.listOf lib.types.str;
       };
-      gitDepth = lib.mkOption {
-        default = 1;
-        type = lib.types.int;
-      };
       gitlabExtra = lib.mkOption {
         default = { };
         type = lib.types.attrsOf lib.types.anything;
@@ -66,7 +62,7 @@ let
       };
     };
 
-  makeGitlabJob = { args, gitDepth, gitlabExtra, image, output, ... }: {
+  makeGitlabJob = { args, gitlabExtra, image, output, ... }: {
     name = toJobName output args;
     value = attrsMerge [
       {
@@ -78,8 +74,8 @@ let
         else
           [ "m . ${output} ${escapeShellArgs args}" ];
         variables = {
-          GIT_DEPTH = gitDepth;
-          MAKES_GIT_DEPTH = gitDepth;
+          GIT_DEPTH = 3;
+          MAKES_GIT_DEPTH = 3;
         };
       }
       gitlabExtra

diff --git a/test/pipelines/.gitlab-ci.yaml b/test/pipelines/.gitlab-ci.yaml
@@ -5,14 +5,14 @@
   script:
     - m . /helloWorld '1' '2' '3'
   variables:
-    GIT_DEPTH: 1
-    MAKES_GIT_DEPTH: 1
+    GIT_DEPTH: 3
+    MAKES_GIT_DEPTH: 3
 /lintNix:
   image: ghcr.io/fluidattacks/makes/amd64:24.02
   interruptible: true
   needs: []
   script:
     - m . /lintNix
   variables:
-    GIT_DEPTH: 1
-    MAKES_GIT_DEPTH: 1
+    GIT_DEPTH: 3
+    MAKES_GIT_DEPTH: 3