aboutsummaryrefslogtreecommitdiff
path: root/guix-data-service
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2023-07-25 17:58:19 +0100
committerChristopher Baines <mail@cbaines.net>2023-07-25 17:58:19 +0100
commitabe50b044378cf1a838410cb8b1ce723e3c4ff4d (patch)
treeb39aa318e67fcf4576cee807e1eaa789357aa094 /guix-data-service
parentbbc53deb1f42852804339a3b7c5e79cd272f9f7c (diff)
downloaddata-service-abe50b044378cf1a838410cb8b1ce723e3c4ff4d.tar
data-service-abe50b044378cf1a838410cb8b1ce723e3c4ff4d.tar.gz
Fix the load revision system sorting
As previously it only applied to system tests.
Diffstat (limited to 'guix-data-service')
-rw-r--r--guix-data-service/jobs/load-new-guix-revision.scm44
1 files changed, 22 insertions, 22 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index 278066b..c10c9d4 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -361,34 +361,34 @@ WHERE job_id = $1")
result)))))
(define (inferior-guix-systems inf)
- (cond
- ((inferior-eval
- '(defined? 'systems
- (resolve-module '(guix platform)))
- inf)
+ ;; The order shouldn't matter here, but bugs in Guix can lead to different
+ ;; results depending on the order, so sort the systems to try and provide
+ ;; deterministic behaviour
+ (sort
+ (cond
+ ((inferior-eval
+ '(defined? 'systems
+ (resolve-module '(guix platform)))
+ inf)
+
+ (remove
+ (lambda (system)
+ ;; There aren't currently bootstrap binaries for s390x-linux, so this
+ ;; just leads to lots of errors
+ (string=? system "s390x-linux"))
+ (inferior-eval
+ '((@ (guix platform) systems))
+ inf)))
- (remove
- (lambda (system)
- ;; There aren't currently bootstrap binaries for s390x-linux, so this
- ;; just leads to lots of errors
- (string=? system "s390x-linux"))
+ (else
(inferior-eval
- '((@ (guix platform) systems))
+ '(@ (guix packages) %supported-systems)
inf)))
-
- (else
- (inferior-eval
- '(@ (guix packages) %supported-systems)
- inf))))
+ string<?))
(define (all-inferior-system-tests inf store guix-source guix-commit)
(define inf-systems
- ;; The order shouldn't matter here, but bugs in Guix can lead to different
- ;; results depending on the order, so sort the systems to try and provide
- ;; deterministic behaviour
- (sort
- (inferior-guix-systems inf)
- string<?))
+ (inferior-guix-systems inf))
(define extract
`(lambda (store)