cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the load revision system sorting

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

14
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -361,6 +361,10 @@ WHERE job_id = $1")
result))))) result)))))
(define (inferior-guix-systems inf) (define (inferior-guix-systems 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 (cond
((inferior-eval ((inferior-eval
'(defined? 'systems '(defined? 'systems
@ -379,16 +383,12 @@ WHERE job_id = $1")
(else (else
(inferior-eval (inferior-eval
'(@ (guix packages) %supported-systems) '(@ (guix packages) %supported-systems)
inf)))) inf)))
string<?))
(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)