Fix for koji buildinfo.

[fedora-ocaml-rebuild.git] / Goalfile

diff --git a/Goalfile b/Goalfile
index 67691bf..0d94149 100644 (file)
--- a/Goalfile
+++ b/Goalfile
@@ -3,12 +3,15 @@
 let fedora-dir = "%HOME/d/fedora"
 
 let branch = "master"
-let side-tag = "f32-build-side-999999"
-let koji = "koji"
+let side-tag = "f32-ocaml"
+#let koji = "koji"
+let koji = "koji -p riscv64"
+#let fedpkg = "fedpkg"
+let fedpkg = "fedpkg --user-config %HOME/d/fedora-ocaml-rebuild/fedpkg-user-config"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let rebuild-name = "OCaml 4.10.0 (beta 1)"
+let rebuild-name = "OCaml 4.09.0 for riscv64"
 
 # Packages that are blocked.  Any dependent packages are also blocked
 # automatically.
@@ -16,7 +19,8 @@ let blocked = [ "ocaml-camlp4" ]
 
 # Packages that are ignored, which means they are treated as if
 # they have been rebuilt.
-let ignored = [ "ocaml-srpm-macros", "ocaml" ]
+#let ignored = [ "ocaml-srpm-macros", "ocaml" ]
+let ignored = [ "ocaml-srpm-macros" ]
 
 # All OCaml-related source package names
 let other-packages = [
@@ -42,6 +46,7 @@ goal all = : source-packages ;
 # Check if the source package has been built in Koji.
 tactic *built-in-koji (pkg) = {
     cd %fedora-dir/%pkg/%branch
+    koji=%koji
     specfile=%pkg.spec
 
     # Packages which are ignored are treated as if they were rebuilt already.
@@ -54,8 +59,9 @@ tactic *built-in-koji (pkg) = {
     grep -sq %rebuild-name $specfile || exit 99
 
     # Else we must check Koji itself.
+    # Koji sends some messages to stderr.
     nvr=$(fedpkg verrel)
-    buildinfo=$(%koji buildinfo $nvr)
+    buildinfo=$($koji buildinfo $nvr 2>&1)
 
     # No build at all, needs rebuild.
     echo "$buildinfo" | grep -sq "No such build" && exit 99
@@ -73,7 +79,7 @@ tactic *built-in-koji (pkg) = {
         exit 1 ;;
     BUILDING)
         # Cancel the build, we will resubmit it.
-        %koji cancel $taskid
+        $koji cancel $taskid
         exit 99 ;;
     CANCELED|DELETED)
         # Do a rebuild.
@@ -86,8 +92,16 @@ tactic *built-in-koji (pkg) = {
 goal rebuild (pkg) =
 *built-in-koji ("%pkg") : source-dependencies (pkg) {
     cd %fedora-dir/%pkg/%branch
+    fedpkg=%fedpkg
+    koji=%koji
     specfile=%pkg.spec
 
+    # We have to wait for the dependencies to become available
+    # before we can start the new build.
+    for p in $($koji latest-build %< | awk '{print $1}'); do
+        $koji --quiet wait-repo side-tag
+    done
+
     # If the specfile doesn't have the magic string then add
     # that now.
     if ! grep -sq %rebuild-name $specfile; then
@@ -95,9 +109,9 @@ goal rebuild (pkg) =
     else
         rpmdev-bumpspec -c "- Bump release and rebuild." *.spec
     fi
-    fedpkg commit -c
-    fedpkg push
-    fedpkg build
+    $fedpkg commit -c
+    $fedpkg push
+    $fedpkg build
 }
 
 # Get the source package names for a particular package.