diff options
| author | Frederick Muriuki Muriithi | 2026-02-18 14:27:33 -0600 |
|---|---|---|
| committer | Frederick Muriuki Muriithi | 2026-03-05 08:47:51 -0600 |
| commit | 2f2c753016a5b597f9f1f52c5cc6ca0c37feebbb (patch) | |
| tree | 1ea190d803e0c9b765e59c4b720ff1249220b279 | |
| parent | 0e6ef96fe889d842e948b44b7859293889728daf (diff) | |
| download | gn-machines-2f2c753016a5b597f9f1f52c5cc6ca0c37feebbb.tar.gz | |
gn-guile: Clone specific branch to use for synchronising with main.
| -rw-r--r-- | genenetwork/services/genenetwork.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/genenetwork/services/genenetwork.scm b/genenetwork/services/genenetwork.scm index 9b851d3..33bdc3a 100644 --- a/genenetwork/services/genenetwork.scm +++ b/genenetwork/services/genenetwork.scm @@ -128,6 +128,8 @@ (default "/opt/home/gn-guile/.ssh/known_hosts")) (gn-doc-git-checkout genenetwork-configuration-gn-doc-git-checkout (default "/export/data/gn-docs")) + (gn-docs-working-branch genenetwork-configuration-gn-docs-working-branch + (default "gn-production-branch")) (gn-virtuoso-ttl-directory genenetwork-configuration-gn-virtuoso-ttl-directory (default "/export/data/virtuoso/ttl")) (gn-tmpdir genenetwork-configuration-gn-tmpdir @@ -662,7 +664,7 @@ a @code{<genenetwork-configuration>} record." #$(program-file "samples-count-script-gexp" (samples-count-script-gexp config))))) -(define (gn-guile-gexp gn-guile-port gn-guile-pkg bare-repo ssh-command) +(define (gn-guile-gexp gn-guile-port gn-guile-pkg bare-repo ssh-command working-branch) (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) @@ -683,13 +685,13 @@ 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" #$(string-append "file://" bare-repo))) + "clone" "--depth" "1" "--branch" #$working-branch #$bare-repo)) (invoke #$(file-append gn-guile "/bin/gn-guile") (number->string #$gn-guile-port))))) (define (gn-guile-shepherd-service config) (match-record config <genenetwork-configuration> - (gn-guile gn-doc-git-checkout gn-guile-port gn-guile-ssh-identity-file gn-guile-known-hosts-file) + (gn-guile gn-doc-git-checkout gn-guile-port gn-guile-ssh-identity-file gn-guile-known-hosts-file gn-docs-working-branch) (shepherd-service (documentation "Run gn-guile server.") (provision '(gn-guile)) @@ -721,7 +723,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-doc-git-checkout ssh-command)) + (gn-guile-gexp gn-guile-port gn-guile gn-doc-git-checkout ssh-command gn-docs-working-branch)) #:name "gn-guile-pola-wrapper" #:directory (dirname gn-doc-git-checkout) #:preserved-environment-variables |