Fix the load revision system sorting

As previously it only applied to system tests.
This commit is contained in:
Christopher Baines 2023-07-25 17:58:19 +01:00
parent bbc53deb1f
commit abe50b0443
1 changed files with 22 additions and 22 deletions

View File

@ -361,34 +361,34 @@ WHERE job_id = $1")
result))))) result)))))
(define (inferior-guix-systems inf) (define (inferior-guix-systems inf)
(cond ;; The order shouldn't matter here, but bugs in Guix can lead to different
((inferior-eval ;; results depending on the order, so sort the systems to try and provide
'(defined? 'systems ;; deterministic behaviour
(resolve-module '(guix platform))) (sort
inf) (cond
((inferior-eval
'(defined? 'systems
(resolve-module '(guix platform)))
inf)
(remove (remove
(lambda (system) (lambda (system)
;; There aren't currently bootstrap binaries for s390x-linux, so this ;; There aren't currently bootstrap binaries for s390x-linux, so this
;; just leads to lots of errors ;; just leads to lots of errors
(string=? system "s390x-linux")) (string=? system "s390x-linux"))
(inferior-eval
'((@ (guix platform) systems))
inf)))
(else
(inferior-eval (inferior-eval
'((@ (guix platform) systems)) '(@ (guix packages) %supported-systems)
inf))) inf)))
string<?))
(else
(inferior-eval
'(@ (guix packages) %supported-systems)
inf))))
(define (all-inferior-system-tests inf store guix-source guix-commit) (define (all-inferior-system-tests inf store guix-source guix-commit)
(define inf-systems (define inf-systems
;; The order shouldn't matter here, but bugs in Guix can lead to different (inferior-guix-systems inf))
;; results depending on the order, so sort the systems to try and provide
;; deterministic behaviour
(sort
(inferior-guix-systems inf)
string<?))
(define extract (define extract
`(lambda (store) `(lambda (store)