about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederick Muriuki Muriithi2025-10-15 10:10:04 -0500
committerFrederick Muriuki Muriithi2025-10-15 10:12:51 -0500
commit1cab434a36d0b3296b896a1fc1cc6b48e41787ea (patch)
tree4dd562477122a90ab873eec0ab39b8839d33bed4
parent738b1d5395813426faa0a89f2b8fa42d98cd11a6 (diff)
downloadgn-machines-1cab434a36d0b3296b896a1fc1cc6b48e41787ea.tar.gz
Pass in the bare repository path to the gexp
Pass in the bare repository path to the gexp and use it instead of
fetching the value from the environment. This decouples the gexp from
changes in the code, e.g. should the environment variable name be
changed, we do not have to change this gexp.
-rw-r--r--genenetwork/services/genenetwork.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/genenetwork/services/genenetwork.scm b/genenetwork/services/genenetwork.scm
index 60fe718..153e87d 100644
--- a/genenetwork/services/genenetwork.scm
+++ b/genenetwork/services/genenetwork.scm
@@ -683,7 +683,7 @@ a @code{<genenetwork-configuration>} record."
                                (make-non-human-data-public-cron-gexp config))
                #:user "gunicorn-gn-auth")))
 
-(define (gn-guile-gexp gn-guile-port gn-guile-pkg)
+(define (gn-guile-gexp gn-guile-port gn-guile-pkg bare-repo)
   (with-imported-modules '((guix build utils))
     #~(begin
         (use-modules (guix build utils))
@@ -703,7 +703,7 @@ a @code{<genenetwork-configuration>} record."
             (delete-file-recursively current-repo-path))
           (setenv "CURRENT_REPO_PATH" current-repo-path)
           (invoke #$(file-append git-minimal "/bin/git")
-                  "clone" "--depth" "1" (getenv "CGIT_REPO_PATH")))
+                  "clone" "--depth" "1" #$bare-repo))
         (invoke #$(file-append gn-guile "/bin/gn-guile")
                 (number->string #$gn-guile-port)))))
 
@@ -725,7 +725,7 @@ a @code{<genenetwork-configuration>} record."
         #~(make-forkexec-constructor
 	   (list #$(least-authority-wrapper
                     (program-file "gn-guile"
-                                  (gn-guile-gexp gn-guile-port gn-guile))
+                                  (gn-guile-gexp gn-guile-port gn-guile gn-doc-git-checkout))
                     #:name "gn-guile-pola-wrapper"
                     #:directory (dirname gn-doc-git-checkout)
                     #:preserved-environment-variables