David Kastrup <d...@gnu.org> writes:
> pat...@gnu.org writes:
>
>> 14:39:40 (UTC) Begin LilyPond compile, previous commit at
>> 1c51a616e289fffb918942c8f1e189ab50809157
>> 14:39:51 Merged staging, now at: 1c51a616e289fffb918942c8f1e189ab50809157
>> 14:39:52 Success: ./autogen.sh --noconfigure
>> 14:40:08 Success: /tmp/lilypond-autobuild/configure
>> --enable-checking
>> 14:40:11 Success: nice make clean
>> 14:44:20 Success: nice make -j9 CPU_COUNT=9
>> 14:47:28 *** FAILED BUILD ***
>> nice make test -j9 CPU_COUNT=9
>> Previous good commit: 7583351fbf2f08a4d1f3f0b075fe8b691adc0b95
>> Current broken commit: 1c51a616e289fffb918942c8f1e189ab50809157
>> 14:47:28 *** FAILED STEP ***
>> merge from staging
>> Failed runner: nice make test -j9 CPU_COUNT=9
>> See the log file log-staging-nice-make-test--j9-CPU_COUNT=9.txt
>> 14:47:28 Traceback (most recent call last):
>> File
>> "/usr/local/tmp/lilypond-extra/patches/compile_lilypond_test/__init__.py",
>> line 528, in handle_staging
>> self.build (issue_id=issue_id)
>> File
>> "/usr/local/tmp/lilypond-extra/patches/compile_lilypond_test/__init__.py",
>> line 328, in build
>> issue_id)
>> File
>> "/usr/local/tmp/lilypond-extra/patches/compile_lilypond_test/__init__.py",
>> line 266, in runner
>> raise FailedCommand ("Failed runner: %s\nSee the log file %s" %
>> (command, this_logfilename))
>> FailedCommand: Failed runner: nice make test -j9 CPU_COUNT=9
>> See the log file log-staging-nice-make-test--j9-CPU_COUNT=9.txt
>
> Error log contains the message:
>
> if test -d /tmp/lilypond-autobuild/.git ; then \
> cd /tmp/lilypond-autobuild ; \
> BR=`LANG=c git branch | grep "^\*" | sed -e "s|^* *||"` ; \
> HD=`git rev-parse --verify HEAD` ; \
> FP=`git merge-base --octopus master HEAD` ; \
> echo " BRANCH: $BR" ; \
> echo " HEAD: $HD" ; \
> if [ ! -z $FP ]; then \
> echo "MERGE_BASE: $FP" ; \
> echo -e '\n HISTORY:\n ========\n' ; \
> git log --pretty=format:" HASH: %H%n SUBJECT: %s%n"
> $FP~1..HEAD ; \
> else \
> echo "MERGE_BASE: unknown" ; \
> echo -e '\n HISTORY:\n ========\n' ; \
> git log --max-count=10 --pretty=format:" HASH:
> %H%nSUBJECT: %s%n" ; \
> fi ; \
> echo "" ; \
> fi > ./out-test/tree.gittxt
> fatal: Not a valid object name master
>
> Apparently, the patch from
> commit 7583351fbf2f08a4d1f3f0b075fe8b691adc0b95
> Author: Knut Petersen <knut_peter...@t-online.de>
> Date: Sun Jul 7 13:16:05 2019 +0200
>
> Optimize tree.gittxt messages
>
> We display BRANCH, HEAD, MERGE-POINT
> and HISTORY fom merge-point to HEAD.
>
> If we do not find a merge-point we
> display the last ten commits if this
> is possible.
>
> relies on the existence of a local (rather than upstream) branch
> "master", not a good idea. I am backing out this commit from staging:
> it needs to get fixed.
Someone or some patchy happening to have a local master branch (a bad
idea since absolutely no development should happen in a local master
branch in our setup) already pushed that commit to staging.
Consequentially, I had to push a revert to staging and hope I'll get it
through without manually tampering with master.
--
David Kastrup
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
