X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fedora_ocaml_rebuild.ml;h=43e21b8e0f139e5c9213c142f9406117ac74fede;hb=ba6f1a85ac41534facc0bbbd0441710be295657f;hp=7c1853f15cc715e43487a58ca8815386249cc15d;hpb=9dfeb3e1660da8d4d81c2e8a03a863be2d224f54;p=goaljobs-goals.git diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml index 7c1853f..43e21b8 100644 --- a/fedora_ocaml_rebuild.ml +++ b/fedora_ocaml_rebuild.ml @@ -9,7 +9,12 @@ open Git open Fedora let branch = "master" -let koji_target = "rawhide" +let side_tag = Some "f24-ocaml" + +let koji_target = + match side_tag with + | Some t -> t + | None -> "rawhide" (* The name of the rebuild, and also the magic substring that must * appear in the %changelog when the package has been rebuilt. @@ -90,12 +95,14 @@ 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" "" @@ -186,7 +193,7 @@ and rebuild_started pkg = require (specfile_updated pkg); (* Rebuild the package in Koji. Don't wait ... *) - koji_build ~wait:false pkg branch; + koji_build ~wait:false ?side_tag pkg branch; (* ... but the build doesn't appear in Koji (eg. in 'koji * buildinfo') until the SRPM has been built. This can take quite