diff options
author | Erich Eckner <git@eckner.net> | 2018-09-17 12:15:31 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2018-09-17 12:15:31 +0200 |
commit | 891b045f1801a4c646631ea90be10a94690ccf9f (patch) | |
tree | 6c63692094f2edabdba68fd3252b951b8233bdec /bin | |
parent | e984775f9c539ccf3dd665ee86941835b054628a (diff) | |
download | builder-891b045f1801a4c646631ea90be10a94690ccf9f.tar.xz |
bin/return-assignment: the slave reports back _its_ architecture, not the one of the build-assignment
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/return-assignment | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/return-assignment b/bin/return-assignment index 56b4dfb..191ff3b 100755 --- a/bin/return-assignment +++ b/bin/return-assignment @@ -283,7 +283,11 @@ build_assignment_id=$( mysql_join_package_sources_upstream_repositories mysql_join_build_assignments_binary_packages mysql_join_binary_packages_binary_packages_in_repositories - mysql_join_build_assignments_architectures + printf ' JOIN `architecture_compatibilities`' + printf ' ON `build_assignments`.`architecture`=`architecture_compatibilities`.`built_for`' + printf ' AND `architecture_compatibilities`.`fully_compatible`' + printf ' JOIN `architectures`' + printf ' ON `architecture_compatibilities`.`runs_on`=`architectures`.`id`' printf ' WHERE `build_slaves`.`id`=from_base64("%s")' \ "$( # shellcheck disable=SC2154 |