diff options
Diffstat (limited to 'guix-qa-frontpage/manage-patch-branches.scm')
-rw-r--r-- | guix-qa-frontpage/manage-patch-branches.scm | 50 |
1 files changed, 3 insertions, 47 deletions
diff --git a/guix-qa-frontpage/manage-patch-branches.scm b/guix-qa-frontpage/manage-patch-branches.scm index b48bfa4..2a0c289 100644 --- a/guix-qa-frontpage/manage-patch-branches.scm +++ b/guix-qa-frontpage/manage-patch-branches.scm @@ -131,15 +131,6 @@ (let ((name (assoc-ref patch "name")) (id (assoc-ref patch "id"))) - (pwclient-check-create - id - #:context "issue" - #:status "success" - #:description "View issue" - #:target-url (simple-format - #f "https://issues.guix.info/~A" - issue-number)) - (simple-format #t "Running git am \"~A.patch\" (~A)\n" id name) @@ -156,20 +147,10 @@ (lambda (exn) (simple-format #t "exception when applying patch ~A: ~A\n" patch-file exn) - (pwclient-check-create - id - #:context "applying patch" - #:status "fail") - - (system* "git" "am" "--skip")) + (raise-exception exn)) (lambda () (simple-format #t "applying ~A\n" patch-file) - (invoke "git" "am" "--empty=drop" "--3way" patch-file) - - (pwclient-check-create - id - #:context "applying patch" - #:status "success")) + (invoke "git" "am" "--empty=drop" "--3way" patch-file)) #:unwind? #t)) id)) patch-data))) @@ -181,7 +162,6 @@ (if (string=? base-commit-hash target-commit-hash) - (simple-format (current-error-port) "Commit hashes match, so no patches have been applied\n") @@ -193,31 +173,7 @@ ;; Delete the branch, to provide a clearer history (system* "git" "push" "--progress" "patches" "--delete" branch-name) - (invoke "git" "push" "--progress" "-u" "patches" branch-name) - - (for-each - (lambda (patch-id) - (pwclient-check-create - patch-id - #:context "git-branch" - #:status "success" - #:description "View Git branch" - #:target-url - (simple-format #f "~A/log/?h=~A&qt=range&q=~A..~A" - "https://git.guix-patches.cbaines.net/guix-patches" - branch-name base-tag branch-name)) - - (pwclient-check-create - patch-id - #:context "comparison" - #:status "success" - #:description "View comparision" - #:target-url - (simple-format #f "~A/compare?base_commit=~A&target_commit=~A" - "https://data.qa.guix.gnu.org" - base-commit-hash - target-commit-hash))) - patch-ids)))))) + (invoke "git" "push" "--progress" "-u" "patches" branch-name)))))) (begin (simple-format #t "all patches have not been received, skipping\n"))))) |