diff options
author | Christopher Baines <mail@cbaines.net> | 2020-07-04 11:24:57 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2020-07-04 11:24:57 +0100 |
commit | ab432800d362b61ac1fce99b98c5b2bdccdfd293 (patch) | |
tree | 2c2e04518f221c14d5386847bd40f9135b9a1d4a /guix-build-coordinator/datastore | |
parent | 804edead119569296e090a3382b8769e48659be2 (diff) | |
download | build-coordinator-ab432800d362b61ac1fce99b98c5b2bdccdfd293.tar build-coordinator-ab432800d362b61ac1fce99b98c5b2bdccdfd293.tar.gz |
Don't skip inserting builds where the system doesn't match
Previously, some builds where skipped for things like fixed output
derivations. If a aarch64-linux build already existed, the x86_64-linux build
for the same output wouldn't be created. This has delayed some builds, because
they're unnecessarily waiting.
Diffstat (limited to 'guix-build-coordinator/datastore')
-rw-r--r-- | guix-build-coordinator/datastore/sqlite.scm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm index 801f895..b4c40a6 100644 --- a/guix-build-coordinator/datastore/sqlite.scm +++ b/guix-build-coordinator/datastore/sqlite.scm @@ -295,6 +295,8 @@ UNION ) SELECT DISTINCT related_derivations.name FROM related_derivations +INNER JOIN derivations + ON related_derivations.name = derivations.name INNER JOIN derivation_outputs ON related_derivations.name = derivation_outputs.derivation_name WHERE related_derivations.name != :derivation @@ -303,6 +305,9 @@ WHERE related_derivations.name != :derivation FROM derivation_outputs INNER JOIN builds ON derivation_outputs.derivation_name = builds.derivation_name + INNER JOIN derivations AS build_derivations + ON builds.derivation_name = build_derivations.name + WHERE build_derivations.system = derivations.system ) "))) |