X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_fedora.ml;h=c101613c1b8cbfd4bc18bdad5d468873b3343383;hb=d561a25015bb195b483cb22b1167074c17611997;hp=38056f42634c0fe5ce4426c94ffb615e027a4e04;hpb=d8c4c60344cccaf397018db4f37c123bb04a2573;p=goaljobs-goals.git diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml index 38056f4..c101613 100644 --- a/libguestfs_fedora.ml +++ b/libguestfs_fedora.ml @@ -22,10 +22,10 @@ let package = "libguestfs" (* How branches in libguestfs upstream map to branches in Fedora. *) let branches = [ -(* "1.22-stable", "f19"; *) (* F19 built by hand. *) - "1.26-stable", "f20"; (* F20 follows 1.26. *) - "1.28-stable", "f21"; (* F20 follows 1.28. *) "1.29-development", "master"; (* Rawhide follows development. *) + "1.29-development", "f22"; (* F22 follows development (for now). *) + "1.28-stable", "f21"; (* F21 follows 1.28. *) + "1.26-stable", "f20"; (* F20 follows 1.26. *) ] (* Goal: Latest website version has been built in every branch. *) @@ -43,7 +43,9 @@ and fedora_built version branch = let specfile = fedora_specfile package branch in target (file_contains_string specfile version.version && - koji_build_state (fedora_verrel package branch) == `Complete); + match koji_build_state (fedora_verrel package branch) with + | `Complete | `Building -> true + | _ -> false); require (sources_uploaded version branch); require (specfile_pushed version branch);