open Goaljobs
open Config
+open Git
open Fedora
let branch = "master"
-let koji_target = "rawhide"
+(*let side_tag = Some "f32-ocaml"*)
+let side_tag = None
+
+let koji_target =
+ match side_tag with
+ | Some t -> t
+ | None -> "f32-build"
(* The name of the rebuild, and also the magic substring that must
* appear in the %changelog when the package has been rebuilt.
*)
-let rebuild_name = "OCaml 4.01.0"
+let rebuild_name = "OCaml 4.08.1 (final)"
+
+(* Local repository that contains build dependencies. *)
+let yum_repo = "koji-rawhide"
-(* Packages that have problems or we just don't want to build. *)
+(* Packages that have problems. These block the packages and all
+ * dependent packages.
+ *)
let blocked = [
- "ocaml-libvirt"; (* RHBZ#1009701 *)
- "ocaml-lwt"; "ocaml-react"; (* loganjerry is handling *)
+ "ocaml-yojson"; (* jjames is looking at this *)
+]
+let blocked pkg = List.mem pkg blocked
+
+(* These packages are treated as if they have been rebuilt. *)
+let ignored = [
+ "ocaml-srpm-macros"; (* don't need to build this *)
+ "ocaml"; (* rebuilt by hand *)
]
+let ignored pkg = List.mem pkg ignored
(* List of OCaml-related source package names. *)
let source_packages =
- let dirs = shlines "cd %s && ls -1d ocaml*" fedora_dir in
+ let dirs = shlines "
+ cd %s && \
+ for f in ocaml*; do
+ [ -f \"$f/master/$f.spec\" ] && echo \"$f\"
+ done
+ " fedora_dir in
dirs @ [ "alt-ergo"; "apron"; "brltty"; "coccinelle"; "coq";
- "cduce"; "frama-c"; "gappalib-coq"; "graphviz"; "hivex";
- "js-of-ocaml"; "llvm"; "plplot"; "whenjobs"; "why3"; "xen" ]
-
-let source_packages =
- List.filter (fun pkg -> not (List.mem pkg blocked)) source_packages
+ "frama-c"; "gappalib-coq"; "graphviz"; "hevea"; "hivex";
+ "opam"; "plplot"; "virt-top"; "why3"; "z3";
+ "flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
+ "libguestfs" ]
(* Dependencies of each package. (pkg, [deps ...]) *)
let pkg_deps = dependencies branch source_packages
+(* Remove blocked packages and packages which have a blocked package
+ * as a dependency (recursively).
+ *)
+let source_packages =
+ let rec is_blocked pkg =
+ if blocked pkg then true
+ else (
+ let deps = List.assoc pkg pkg_deps in
+ List.exists is_blocked deps
+ )
+ in
+ List.filter (fun pkg -> not (is_blocked pkg)) source_packages
+
+(* Short the dependencies lists so that the build order is stable
+ * each time it runs.
+ *)
+let pkg_deps =
+ List.map (fun (pkg, deps) -> pkg, List.sort compare deps) pkg_deps
+
+(* Sort the source packages so that the packages with the largest
+ * number of reverse dependencies [other packages that depend on it]
+ * appear earlier in the list, on the basis that building these
+ * packages first has the greatest advantage.
+ *)
+let source_packages =
+ let rdeps pkg =
+ Utils.filter_map (
+ fun (rdep, deps) -> if List.mem pkg deps then Some rdep else None
+ ) pkg_deps
+ in
+ let cmp p1 p2 =
+ let r1 = rdeps p1 and r2 = rdeps p2 in
+ let n1 = List.length r1 and n2 = List.length r2 in
+ if n1 <> n2 then compare n2 n1 else compare p1 p2
+ in
+ List.sort cmp source_packages
+
+let () =
+ printf "final list of source packages = %s\n%!"
+ (String.concat " " source_packages)
+
+(*
+(* We could make this a goal, but it's cheap enough to run it unconditionally. *)
+let install_build_dependencies pkg =
+ sh "sudo yum clean all --disablerepo=\\* --enablerepo=%s"
+ (quote yum_repo);
+ sh "sudo yum-builddep -y --disablerepo=\\* --enablerepo=%s %s"
+ (quote yum_repo) (fedora_specfile pkg branch)
+ *)
+
+(* Unset MAKEFLAGS so it doesn't affect local builds. *)
+let () = Unix.putenv "MAKEFLAGS" ""
+
(* Goal: rebuild all packages. *)
let rec goal all () =
- List.iter (fun pkg -> require (rebuild_started pkg)) source_packages
+ let n = List.length source_packages in
+ List.iteri (
+ fun i pkg ->
+ require (rebuild_started pkg);
+ printf "*** *** rebuilt %d/%d packages *** ***\n%!" (i+1) n
+ ) source_packages
(* Goal: That 'package' has been rebuilt and exists in Koji. *)
and rebuilt pkg =
* could exist as a koji build without it having been part of the
* rebuild.
*)
- target (file_contains_string specfile rebuild_name &&
- koji_build_state (fedora_verrel pkg branch) == `Complete);
-
- (* Start the rebuild. *)
- require (rebuild_started pkg);
-
- (* Wait for the build state to reach a conclusion. *)
- let rec loop () =
- match koji_build_state (fedora_verrel pkg branch) with
- | `Building ->
- sleep 30;
- loop ()
- | `Complete ->
- ()
- | `Deleted ->
- failwith (sprintf "rebuild of package %s: deleted" pkg)
- | `Failed ->
- failwith (sprintf "rebuild of package %s: failed" pkg)
- | `Canceled ->
- failwith (sprintf "rebuild of package %s: canceled" pkg)
- in
- loop ();
+ target (ignored pkg ||
+ (file_contains_string specfile rebuild_name &&
+ koji_build_state (fedora_verrel pkg branch) == `Complete));
- (* Wait for the build to appear in Koji repo. *)
- koji_wait_repo koji_target (fedora_verrel pkg branch)
+ (* Ignored packages are treated as if they have been rebuilt. *)
+ if not (ignored pkg) then (
+
+ (* Start the rebuild. *)
+ require (rebuild_started pkg);
+
+ (* Wait for the build state to reach a conclusion. *)
+ let rec loop () =
+ match koji_build_state (fedora_verrel pkg branch) with
+ | `No_such_build ->
+ failwith (sprintf "rebuild of package %s: no build found" pkg)
+ | `Building ->
+ sleep 60;
+ loop ()
+ | `Complete ->
+ ()
+ | `Deleted ->
+ failwith (sprintf "rebuild of package %s: deleted" pkg)
+ | `Failed ->
+ failwith (sprintf "rebuild of package %s: failed" pkg)
+ | `Canceled ->
+ failwith (sprintf "rebuild of package %s: canceled" pkg)
+ in
+ loop ();
+
+ (* Wait for the build to appear in Koji repo. *)
+ koji_wait_repo koji_target (fedora_verrel pkg branch)
+ )
(* Goal: The rebuild of the package has started, but we haven't waited
* for it to finish.
* could exist as a koji build without it having been part of the
* rebuild.
*)
- target (file_contains_string specfile rebuild_name &&
- (match koji_build_state (fedora_verrel pkg branch) with
- | `Building | `Complete -> true
- | `Deleted | `Failed | `Canceled -> false));
+ target (ignored pkg ||
+ (file_contains_string specfile rebuild_name &&
+ (match koji_build_state (fedora_verrel pkg branch) with
+ | `Building | `Complete -> true
+ | `Deleted | `Failed | `Canceled | `No_such_build -> false)));
(* All dependent packages must have been fully rebuilt and in the
* repo first.
*)
List.iter (fun dep -> require (rebuilt dep)) deps;
- (* A local test build must succeed. *)
- require (local_build_succeeded pkg);
+ (* Ignored packages are treated as if they have been rebuilt. *)
+ if not (ignored pkg) then (
+(*
+ (* A local test build must succeed. *)
+ require (local_build_succeeded pkg);
+*)
+ (* local_build_succeeded normally does this ... *)
+ require (specfile_updated pkg);
+
+ (* Rebuild the package in Koji. Don't wait ... *)
+ koji_build ~wait:false ?side_tag pkg branch;
- (* Rebuild the package in Koji, but don't wait. *)
- koji_build ~wait:false pkg branch
+ (* ... but the build doesn't appear in Koji (eg. in 'koji
+ * buildinfo') until the SRPM has been built. This can take quite
+ * some time. Loop here until the build appears.
+ *)
+ let rec loop () =
+ match koji_build_state (fedora_verrel pkg branch) with
+ | `No_such_build ->
+ sleep 60;
+ loop ();
+ | `Building | `Complete ->
+ ()
+ | `Deleted ->
+ failwith (sprintf "rebuild of package %s: deleted" pkg)
+ | `Failed ->
+ failwith (sprintf "rebuild of package %s: failed" pkg)
+ | `Canceled ->
+ failwith (sprintf "rebuild of package %s: canceled" pkg)
+ in
+ loop ()
+ )
+(*
and local_build_succeeded pkg =
(* The specfile must have been updated. *)
require (specfile_updated pkg);
target (memory_exists key);
- (* Do a local test build to ensure the Koji build will work. *)
+ install_build_dependencies pkg;
+
+ (* Do a local test build to ensure the Koji build will work. *)
sh "
cd %s
- sudo yum-builddep %s
- fedpkg local
- " (fedora_repo pkg branch)
- (fedora_specfile pkg branch);
+ fedpkg local
+ " (fedora_repo pkg branch);
memory_set key "1"
+*)
and specfile_updated pkg =
let repodir = fedora_repo pkg branch in
let specfile = fedora_specfile pkg branch in
- (* XXX Automate common changes. *)
- let title = rebuild_name ^ " rebuild." in
sh "
cd %s
- git pull --rebase
- rm -rf x86_64 noarch *.src.rpm
- rpmdev-bumpspec -c %s %s
- echo 'Please make further changes as required to the spec file %s.spec'
- echo '(Press return key)'
- read
- emacs -nw %s
- echo 'OK to commit this change? (press ^C if not)'
- read
+ rm -rf x86_64 noarch *.src.rpm .build* clog
+ git fetch
+ " repodir;
+
+ if not (git_has_local_changes repodir) then
+ sh "
+ cd %s
+ git pull --rebase
+ " repodir;
+
+(* - XXX why did we do this here?
+ install_build_dependencies pkg;
+*)
+
+ (* For rationale behind always bumping the spec file, see comment
+ * in 'fedora.ml'.
+ *)
+ let title =
+ if not (file_contains_string specfile rebuild_name) then
+ rebuild_name ^ " rebuild."
+ else
+ "Bump release and rebuild." in
+ sh "rpmdev-bumpspec -c %s %s" (quote title) specfile;
+
+ (* XXX Automate common specfile fixes. *)
+
+ sh "
+ cd %s
fedpkg commit -c
- echo 'OK to push this change? (press ^C if not)'
- read
fedpkg push
" repodir
- (quote title) specfile
- pkg
- specfile
git.annexia.org / goaljobs-goals.git / blobdiff