From f05dafb2b8da4c7361879df66972cd1504c38706 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Wed, 22 Aug 2018 10:32:39 +0300 Subject: Read project/jobset according to farm type (Hydra or Cuirass) * build-farm.el (build-farm-check-project-support): New procedure. (build-farm-read-project, build-farm-read-jobset): Use keyword arguments. * build-farm-build.el (build-farm-build-latest-prompt-args): Prompt for project only for Hydra farm. * build-farm-popup.el (build-farm-popup-read-jobset): Likewise. (build-farm-popup-read-project): New procedure. * build-farm-project.el (build-farm-projects, build-farm-project): Check if current farm type is Hydra. --- build-farm-build.el | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'build-farm-build.el') diff --git a/build-farm-build.el b/build-farm-build.el index 1c449c1..95f462f 100644 --- a/build-farm-build.el +++ b/build-farm-build.el @@ -78,11 +78,19 @@ If `current-prefix-arg' is specified, just return job system) "Prompt for and return a list of 'latest builds' arguments." (let* ((number (build-farm-build-read-number-maybe)) - (project (if current-prefix-arg - (build-farm-read-project nil project) - project)) + (url (build-farm-current-url)) + (url-type (build-farm-url-type url)) + (project (unless (eq 'cuirass url-type) + (if current-prefix-arg + (build-farm-read-project + :url url + :initial-input project) + project))) (jobset (if current-prefix-arg - (build-farm-read-jobset project nil jobset) + (build-farm-read-jobset + :url url + :project project + :initial-input jobset) jobset)) (job-or-name (if current-prefix-arg (build-farm-read-job nil job) -- cgit v1.2.3