git.annexia.org
/
goaljobs-goals.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverse the order of Fedora builds so we build Rawhide first.
[goaljobs-goals.git]
/
libguestfs_fedora.ml
diff --git
a/libguestfs_fedora.ml
b/libguestfs_fedora.ml
index
886c2d3
..
c101613
100644
(file)
--- 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 = [
(* How branches in libguestfs upstream map to branches in Fedora. *)
let branches = [
-(* "1.22-stable", "f19"; *) (* F19 built by hand. *)
+ "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. *)
"1.26-stable", "f20"; (* F20 follows 1.26. *)
-(* F21 is built by pulling from master *)
- "1.27-development", "master"; (* Rawhide follows development. *)
]
(* Goal: Latest website version has been built in every branch. *)
]
(* 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 &&
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);
require (sources_uploaded version branch);
require (specfile_pushed version branch);