summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2018-07-18 23:04:02 +0300
committerAlex Kost <alezost@gmail.com>2018-07-27 12:14:24 +0300
commitb5a4de0b0bd8caaa3b5f5050296c2b9c73789cd5 (patch)
tree60574b4b4f1515b0b1dcc1ba7ef62198c37ed543
parentUse per-buffer build farm URL (diff)
downloademacs-build-farm-b5a4de0b0bd8caaa3b5f5050296c2b9c73789cd5.tar.gz
Factorize defining system types
* build-farm-url.el (build-farm-url-package-manager): New function. * build-farm.el (build-farm-system-types): Use it.
-rw-r--r--build-farm-url.el12
-rw-r--r--build-farm.el16
2 files changed, 18 insertions, 10 deletions
diff --git a/build-farm-url.el b/build-farm-url.el
index 1c566df..6a5e62e 100644
--- a/build-farm-url.el
+++ b/build-farm-url.el
@@ -77,6 +77,18 @@ Arbitrarily choosing `%S' type for this URL."
url type)
type)))
+(defun build-farm-url-package-manager (&optional url)
+ "Return a package manager for the build farm URL.
+The returned value is either `nix' or `guix' symbols or nil, if
+the package manager cannot be determined.
+If URL is nil, use `build-farm-url'."
+ (or url (setq url build-farm-url))
+ (cond ((or (string-match-p (regexp-opt '("gnu" "guix")) url)
+ (eq 'cuirass (build-farm-url-type url)))
+ 'guix)
+ ((string-match-p "nix" url)
+ 'nix)))
+
(defun build-farm-url (&optional root-url &rest url-parts)
"Return build farm ROOT-URL with URL-PARTS concatenated to it.
If ROOT-URL is nil, `build-farm-url' variable is used."
diff --git a/build-farm.el b/build-farm.el
index 46cb3e0..454f77a 100644
--- a/build-farm.el
+++ b/build-farm.el
@@ -77,16 +77,12 @@
(defun build-farm-system-types (&optional url)
"Return a list of systems supported by URL.
If URL is nil, use `build-farm-url'."
- (or url (setq url build-farm-url))
- (cond ((string-match-p "nix" url)
- build-farm-nix-system-types)
- ((or (string-match-p "gnu" url)
- (string-match-p "guix" url))
- build-farm-guix-system-types)
- (t
- (delete-dups
- (append build-farm-nix-system-types
- build-farm-guix-system-types)))))
+ (cl-case (build-farm-url-package-manager url)
+ (nix build-farm-nix-system-types)
+ (guix build-farm-guix-system-types)
+ (t (delete-dups
+ (append build-farm-nix-system-types
+ build-farm-guix-system-types)))))
(defvar build-farm-job-regexp ".+\\.[^.]+"