aboutsummaryrefslogtreecommitdiff
path: root/genenetwork-development.scm
diff options
context:
space:
mode:
Diffstat (limited to 'genenetwork-development.scm')
-rw-r--r--genenetwork-development.scm55
1 files changed, 12 insertions, 43 deletions
diff --git a/genenetwork-development.scm b/genenetwork-development.scm
index fe2392b..d22e926 100644
--- a/genenetwork-development.scm
+++ b/genenetwork-development.scm
@@ -207,35 +207,6 @@ executed."
(chdir "genenetwork2")
(apply invoke '#$test-command))))))
-(define (genenetwork3-tests tests-command manifest)
- "Return a G-expression running TESTS-COMMAND in a profile described
-by MANIFEST with the latest git checkout of genenetwork3 as the
-current directory. TESTS-COMMAND is a list of strings specifying the
-command to be executed."
- (with-imported-modules (source-module-closure '((genenetwork development-helper))
- #:select? import-module?)
- #~(lambda (genenetwork3-checkout)
- ((@@ (genenetwork development-helper)
- command-in-source-gexp)
- genenetwork3-checkout
- #$(profile
- (content manifest)
- (allow-collisions? #t))
- '#$tests-command))))
-
-(define gn-auth-pylint
- (with-imported-modules (source-module-closure '((genenetwork development-helper))
- #:select? import-module?)
- #~(lambda (gn-auth-checkout)
- ((@@ (genenetwork development-helper)
- genenetwork-lint-gexp)
- gn-auth-checkout
- #$(profile
- (content (manifest-cons* python-pylint shellcheck
- (package->development-manifest gn-auth)))
- (allow-collisions? #t))
- (list "main.py" "setup.py" "wsgi.py" "tests" "gn_auth" "scripts")))))
-
(define %xapian-directory
"/export/data/genenetwork-xapian")
@@ -411,6 +382,9 @@ genenetwork3 source from the latest commit of @var{project}."
(name 'gn-auth)
(url (forge-project-repository this-forge-project))
(branch "main")))
+ #:variables (list (variable-specification
+ (module '(gn-auth))
+ (name 'gn-auth)))
#:guix-daemon-uri %guix-daemon-uri))
;; If unit tests pass, restart the auth server.
(after (with-imported-modules '((guix build utils))
@@ -424,20 +398,15 @@ genenetwork3 source from the latest commit of @var{project}."
(invoke #$(file-append laminar "/bin/laminarc")
"queue" "genenetwork2"))))))
(forge-laminar-job
- (name "gn-auth-pylint")
- (run (derivation-job-gexp
- this-forge-project
- this-forge-laminar-job
- gn-auth-pylint
- #:guix-daemon-uri %guix-daemon-uri)))
- (forge-laminar-job
- (name "gn-auth-mypy")
- (run (derivation-job-gexp
- this-forge-project
- this-forge-laminar-job
- (genenetwork3-tests (list "mypy" ".")
- (manifest-cons python-mypy
- (package->development-manifest gn-auth)))
+ (name "gn-auth-all-tests")
+ (run (guix-channel-job-gexp
+ (list (channel
+ (name 'gn-auth)
+ (url (forge-project-repository this-forge-project))
+ (branch "main")))
+ #:variables (list (variable-specification
+ (module '(gn-auth))
+ (name 'gn-auth-all-tests)))
#:guix-daemon-uri %guix-daemon-uri)))))
(ci-jobs-trigger 'webhook)))))