diff options
| author | Christopher Baines <mail@cbaines.net> | 2022-12-09 11:22:59 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2022-12-09 11:22:59 +0000 |
| commit | d21e0f80a63e52c73e3e8ec50296e9262467701e (patch) | |
| tree | 1cccf7d634f82d9c2feb80fb4434fc7af2ec2b88 | |
| parent | 49c08adc199639b1bae7e747642f94f130662e06 (diff) | |
| download | qa-frontpage-d21e0f80a63e52c73e3e8ec50296e9262467701e.tar qa-frontpage-d21e0f80a63e52c73e3e8ec50296e9262467701e.tar.gz | |
Treat issue numbers as numbers when managing patch branches
| -rw-r--r-- | guix-qa-frontpage/manage-patch-branches.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/guix-qa-frontpage/manage-patch-branches.scm b/guix-qa-frontpage/manage-patch-branches.scm index 563487c..8104504 100644 --- a/guix-qa-frontpage/manage-patch-branches.scm +++ b/guix-qa-frontpage/manage-patch-branches.scm @@ -220,7 +220,7 @@ (define (perform-pass) (let* ((issue-numbers - (issue-numbers-for-branches)) + (map string->number (issue-numbers-for-branches))) (all-patchwork-series (latest-patchwork-series-by-issue)) (series-to-create-branches-for @@ -239,12 +239,12 @@ #f) (let* ((series (assq-ref all-patchwork-series - (string->number issue-number))) + issue-number)) (comparison-url (and series (and=> (get-issue-branch-base-and-target-refs - (string->number issue-number)) + issue-number) patch-series-compare-url)))) (with-exception-handler (lambda (exn) @@ -273,9 +273,9 @@ #:unwind? #t))) (run "git" "push" "patches" "--delete" - (string-append "base-for-issue-" issue-number)) + (simple-format #f "base-for-issue-~A" issue-number)) (run "git" "push" "patches" "--delete" - (string-append "issue-" issue-number)))) + (simple-format #f "issue-~A" issue-number)))) issue-numbers))) (simple-format #t "finished checking for branches to delete\n") @@ -284,9 +284,9 @@ (match-lambda ((issue-number . patchwork-series) (when (or (not - (member (number->string issue-number) + (member issue-number issue-numbers - string=?)) + =)) ;; Does the branch need re-creating with a new series? (let ((branch-committer-date |