X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_upstream.ml;h=685c1b59de59f31dc996716ff487b49eba4f308c;hb=5324bda8dbb31613640901bfba9b0dd339bc9616;hp=b1daa19bc3a44f5998845a69181ed86831cba6f3;hpb=a5307c59588236ff52821d815e392406871cf4b1;p=goaljobs-goals.git

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index b1daa19..685c1b5 100644
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -38,6 +38,8 @@ let rec goal website_updated version =
 
   require (tarball_created version);
   require (tarball_tested version);
+  if version.is_stable then
+    require (tarball_signed version);
 
   (* Python sdists only generated for stable releases. *)
   if version.is_stable then (
@@ -72,10 +74,13 @@ and website_checked_in version =
 
   require (tarball_created version);
   require (tarball_tested version);
+  if version.is_stable then
+    require (tarball_signed version);
 
   sh "
     cd %s
     cp %s/tarballs/%s %s
+    if %b; then cp %s/tarballs/%s.sig %s.sig; fi
     git add %s
     cd %s
     git add *.txt *.html
@@ -83,6 +88,7 @@ and website_checked_in version =
     git commit -m \"Version %s\"
   " libguestfs_download_repo
     buildtmp version.tarball version.urlpath
+    version.is_stable buildtmp version.tarball version.urlpath
     version.urlpath
     libguestfs_website_repo
     websites_repo
@@ -116,6 +122,16 @@ and website_built version =
     (quote (libguestfs_localenv (supermin version)))
     (quote websites_repo)
 
+(* Goal: for stable versions, the tarball must be signed. *)
+and tarball_signed version =
+  let tar_file = sprintf "%s/tarballs/%s" buildtmp version.tarball in
+  let sig_file = tar_file ^ ".sig" in
+  target (file_exists sig_file);
+
+  require (tarball_created version);
+
+  sh "sign-tarball %s" tar_file
+
 (* Goal: the tarball has passed the required set of tests before
  * a release is allowed.
  *)
@@ -136,7 +152,13 @@ and tarball_tested version =
 
     ./localconfigure
     make V=1
-    make check-release
+    if ! make check-release; then
+      for f in `find -name test-suite.log | xargs grep -l ^FAIL:`; do
+        echo \"*** $f ***\"
+        cat $f
+      done
+      exit 1
+    fi
   " buildtmp version.tarball
     version.package_version
     (quote (libguestfs_localconfigure `Tarball))
@@ -216,7 +238,13 @@ and commit_tested branch commit =
 
     ./localconfigure
     make V=1
-    make check-release
+    if ! make check-release; then
+      for f in `find -name test-suite.log | xargs grep -l ^FAIL:`; do
+        echo \"*** $f ***\"
+        cat $f
+      done
+      exit 1
+    fi
   " repodir
     commit
     (quote (libguestfs_localconfigure `Git))