Sort systems and targets for more deterministic behaviour
As the ordering from Guix seems to be non-deterministic.
This commit is contained in:
parent
ef73305250
commit
348fe36b55
|
@ -383,7 +383,12 @@ WHERE job_id = $1")
|
||||||
|
|
||||||
(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
|
||||||
(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
|
||||||
|
(inferior-guix-systems inf)
|
||||||
|
string<?))
|
||||||
|
|
||||||
(define extract
|
(define extract
|
||||||
`(lambda (store)
|
`(lambda (store)
|
||||||
|
@ -683,9 +688,11 @@ WHERE job_id = $1")
|
||||||
'(defined? 'targets
|
'(defined? 'targets
|
||||||
(resolve-module '(guix platform)))
|
(resolve-module '(guix platform)))
|
||||||
inf)
|
inf)
|
||||||
(inferior-eval
|
(sort
|
||||||
'((@ (guix platform) targets))
|
(inferior-eval
|
||||||
inf))
|
'((@ (guix platform) targets))
|
||||||
|
inf)
|
||||||
|
string<?))
|
||||||
|
|
||||||
(else
|
(else
|
||||||
'("arm-linux-gnueabihf"
|
'("arm-linux-gnueabihf"
|
||||||
|
|
Loading…
Reference in New Issue