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
Make F22 and F23 follow 1.30
[goaljobs-goals.git]
/
libguestfs_fedora.ml
diff --git
a/libguestfs_fedora.ml
b/libguestfs_fedora.ml
index
38056f4
..
29b1201
100644
(file)
--- a/
libguestfs_fedora.ml
+++ b/
libguestfs_fedora.ml
@@
-22,10
+22,11
@@
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.31-development", "master"; (* Rawhide follows development. *)
+ "1.30-stable", "f23"; (* F23 follows 1.30. *)
+ "1.30-stable", "f22"; (* F22 follows 1.30. *)
+ "1.28-stable", "f21"; (* F21 follows 1.28. *)
"1.26-stable", "f20"; (* F20 follows 1.26. *)
"1.26-stable", "f20"; (* F20 follows 1.26. *)
- "1.28-stable", "f21"; (* F20 follows 1.28. *)
- "1.29-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
+44,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);
@@
-92,7
+95,8
@@
and specfile_updated version branch =
and specfile_committed version branch =
let repodir = fedora_repo package branch in
and specfile_committed version branch =
let repodir = fedora_repo package branch in
- let key = sprintf "libguestfs_fedora_specfile_committed_%s" version.version in
+ let key = sprintf "libguestfs_fedora_specfile_committed_%s_%s"
+ branch version.version in
target (memory_exists key);
onrun (fun () -> memory_set key "1");
target (memory_exists key);
onrun (fun () -> memory_set key "1");
@@
-106,7
+110,8
@@
and specfile_committed version branch =
and specfile_pushed version branch =
let repodir = fedora_repo package branch in
and specfile_pushed version branch =
let repodir = fedora_repo package branch in
- let key = sprintf "libguestfs_fedora_specfile_pushed_%s" version.version in
+ let key =
+ sprintf "libguestfs_fedora_specfile_pushed_%s_%s" branch version.version in
target (memory_exists key);
onrun (fun () -> memory_set key "1");
target (memory_exists key);
onrun (fun () -> memory_set key "1");