stdlib/fedora: Use grep -F when matching %fedora-rebuild-name

[goals.git] / stdlib / fedora.gl

diff --git a/stdlib/fedora.gl b/stdlib/fedora.gl
index 8bcc09a..a9f43ed 100644 (file)
--- a/stdlib/fedora.gl
+++ b/stdlib/fedora.gl
@@ -26,7 +26,7 @@
 # of dist git.  You must use the fedpkg clone -B command to
 # create separate branches.
 #
-# %fedora-branch:   Working branch, eg. "master".
+# %fedora-branch:   Working branch, eg. "rawhide".
 # %fedora-tag:      Build tag, eg. "f32-build".
 #
 # %fedora-rebuild-name:
@@ -34,6 +34,11 @@
 # detect if a rebuild has been attempted before in this run.
 # eg. "Perl 5.99 rebuild"
 #
+# %fedora-retry-failed:
+# If set to 1 then failed builds are retried automatically.
+# If set to 0 then failed builds must be manually restarted.
+# Normally you want this to be 0.
+#
 # %fedora-source-packages:
 # List of source packages that will be rebuilt.
 #
@@ -56,9 +61,14 @@ predicate is-koji-built (pkg) = {
         if [ %pkg = "$p" ]; then exit 0; fi
     done
 
-    # If the specfile doesn't have the magic string then the
-    # package definitely needs to be rebuilt.
-    grep -sq %fedora-rebuild-name $specfile || exit 99
+    if ! grep -sq "^%%autochangelog" $specfile; then
+        # If the specfile doesn't have the magic string then the
+        # package definitely needs to be rebuilt.
+        grep -sqF %fedora-rebuild-name $specfile || exit 99
+    else
+        # Using autochangelog.
+        git log | grep -sqF %fedora-rebuild-name || exit 99
+    fi
 
     # Else we must check Koji itself.
     # Koji sends some messages to stderr.
@@ -77,8 +87,13 @@ predicate is-koji-built (pkg) = {
         # Complete so we don't need to rebuild.
         exit 0 ;;
     FAILED)
-        # Failed builds must be examined and fixed manually.
-        exit 1 ;;
+        if [ %fedora-retry-failed -ne 0 ]; then
+            # Resubmit it automatically.
+            exit 99
+        else
+            # Fail, must be examined and retried manually.
+            exit 1
+        fi ;;
     BUILDING)
         # Cancel the build, we will resubmit it.
         koji cancel $taskid ||:
@@ -103,6 +118,7 @@ is-koji-built ("%pkg") :
     # before we can start the new build.
     for p in %<; do
         nvr=$(koji --quiet latest-build %fedora-tag $p | awk '{print $1}')
+        test -n "$nvr" || exit 1
         while ! koji wait-repo --timeout=10000 %fedora-tag --build=$nvr; do sleep 1m; done
     done
 
@@ -111,21 +127,33 @@ is-koji-built ("%pkg") :
     # would need to be corrected/integrated by hand.
     git pull
 
-    # If we're not building for Rawhide then we must use the rightmost
-    # (-r) flag so there's an upgrade path to Rawhide.
-    rightmost=
-    if test %fedora-branch != "master"; then rightmost=-r; fi
-
-    # If the specfile doesn't have the magic string then add
-    # that now.
-    if ! grep -sq %fedora-rebuild-name $specfile; then
-        rpmdev-bumpspec -c "- "%fedora-rebuild-name $rightmost *.spec
+    # Add the new commit.
+    if ! grep -sq "^%%autochangelog" $specfile; then
+        # If we're not building for Rawhide then we must use the
+        # rpmdev-bumpspec rightmost (-r) flag so there's an upgrade
+        # path to Rawhide.
+        rightmost=
+        if test %fedora-branch != "rawhide"; then rightmost=-r; fi
+
+        # If the specfile doesn't have the magic string then add
+        # that now.
+        if ! grep -sqF %fedora-rebuild-name $specfile; then
+            rpmdev-bumpspec -c "- "%fedora-rebuild-name $rightmost *.spec
+        else
+            rpmdev-bumpspec -c "- Bump release and rebuild" $rightmost *.spec
+        fi
+
+        fedpkg commit -c
     else
-        rpmdev-bumpspec -c "- Bump release and rebuild." $rightmost *.spec
+        # Using autochangelog.
+        if ! git log | grep -sqF %fedora-rebuild-name; then
+            git commit --allow-empty -m %fedora-rebuild-name
+        else
+            git commit --allow-empty -m "Bump release and rebuild"
+        fi
     fi
 
-    # Commit and push the change.
-    fedpkg commit -c
+    # Push the new commit.
     fedpkg push
 
     # Do the Koji build in the side tag.
@@ -143,26 +171,23 @@ pure function fedora-source-dependencies (pkg) returning strings = @{
 
     # We will require the mapping of all source packages to the
     # list of binary packages they build, so work this out in advance.
-    declare -A binpkgs
+    declare -A bin2src
     for p in %fedora-source-packages; do
-        binpkgs[$p]="$(
-            rpmspec -q --provides %fedora-dir/$p/%fedora-branch/$p.spec 2>/dev/null |
-            awk '{print $1}'
-        )"
+        p_specfile=%fedora-dir/$p/%fedora-branch/$p.spec
+        p_depcache=%fedora-dir/$p/%fedora-branch/.depcache
+        if ! test -f "$p_depcache" || test "$p_specfile" -nt "$p_depcache";
+        then
+            rm -f $p_depcache
+            for b in $(rpmspec -q --provides $p_specfile 2>/dev/null | awk '{print $1}'); do
+                echo "bin2src['$b']='$p'" >> $p_depcache
+            done
+        fi
+        source $p_depcache
     done
 
-    for r in $(rpmspec -q --buildrequires $specfile 2>/dev/null |
+    for b in $(rpmspec -q --buildrequires $specfile 2>/dev/null |
                awk '{print $1}'); do
-        # Now we examine each *other* source package to see
-        # if any will create this dependency when they build.
-        for p in %fedora-source-packages; do
-            if [ "$p" != %pkg ]; then
-                for f in ${binpkgs[$p]}; do
-                    if [ "$f" = "$r" ]; then
-                        echo "$p"
-                    fi
-                done
-            fi
-        done
-    done | sort -u
+        # Find the source package that produces these binary requirements.
+        echo ${bin2src[$b]}
+    done | grep -v '^$' | sort -u
 }