| Message ID | 1423088766.29180.129.camel@surprise |
|---|---|
| State | New |
| Headers | show |
On Wed, 2015-02-04 at 17:26 -0500, David Malcolm wrote: > On Wed, 2015-02-04 at 22:21 +0100, Gerald Pfeifer wrote: > > On Wednesday 2015-02-04 14:10, David Malcolm wrote: > > > Gerald: Please can you do the "svn up" on the relevant machine again, > > > so that it gets the updated "update_web_docs_svn"? > > > > That was my plan, yes. :-) I just did that and manually ran > > the script, and it seems to work. > > Thank you! > > The jit docs are now visible on the GCC website at: > https://gcc.gnu.org/onlinedocs/jit/ and fwiw: https://gcc.gnu.org/ml/gccadmin/2015-q1/msg00080.html shows that the cronjob then successfully rebuilt them again from svn. > (sadly the "Show Source" link on each page is a 404; iirc the "pyramid" > theme didn't show these links so I didn't bother copying up the files; > I'll look at fixing that). > > > Still, do you think you can add a bit of error handling such > > that an issue like the one we had (cf. > > https://gcc.gnu.org/ml/gccadmin/2015-q1/msg00077.html ) does > > not kill the entire script? A bit of resilience would be good. > > Something like the attached? (completely untested, sorry) >
On Wed, 4 Feb 2015, David Malcolm wrote: >> That was my plan, yes. :-) I just did that and manually ran >> the script, and it seems to work. > Thank you! >> Still, do you think you can add a bit of error handling such >> that an issue like the one we had (cf. >> https://gcc.gnu.org/ml/gccadmin/2015-q1/msg00077.html ) does >> not kill the entire script? A bit of resilience would be good. > Something like the attached? (completely untested, sorry) Yes. Given that this was a while ago (ahem), I went ahead, created a ChangeLog entry, committed the patch on your behalf, updated the version on gcc.gnu.org, and did a test run there. Gerald 2019-08-05 David Malcolm <dmalcolm@redhat.com> * update_web_docs_svn: Proceed even if the invocation of sphinx fails. Index: update_web_docs_svn =================================================================== --- update_web_docs_svn (revision 274098) +++ update_web_docs_svn (working copy) @@ -190,7 +190,7 @@ done # /usr/bin/sphinx-1.0-build # so we need to override SPHINXBUILD with this when invoking "make". pushd gcc/gcc/jit/docs -make SPHINXBUILD=/usr/bin/sphinx-1.0-build html +make SPHINXBUILD=/usr/bin/sphinx-1.0-build html || true popd cp -a gcc/gcc/jit/docs/_build/html jit mkdir -p $DOCSDIR/jit
diff --git a/maintainer-scripts/update_web_docs_svn b/maintainer-scripts/update_web_docs_svn index e0132dc..c1ff903 100755 --- a/maintainer-scripts/update_web_docs_svn +++ b/maintainer-scripts/update_web_docs_svn @@ -180,7 +180,7 @@ done # /usr/bin/sphinx-1.0-build # so we need to override SPHINXBUILD with this when invoking "make". pushd gcc/gcc/jit/docs -make SPHINXBUILD=/usr/bin/sphinx-1.0-build html +make SPHINXBUILD=/usr/bin/sphinx-1.0-build html || true popd cp -a gcc/gcc/jit/docs/_build/html jit mkdir -p $DOCSDIR/jit