On 9/1/21 6:24 PM, Philippe Mathieu-Daudé wrote: > On 9/1/21 5:53 PM, Daniel P. Berrangé wrote: >> On Wed, Sep 01, 2021 at 05:35:42PM +0200, Philippe Mathieu-Daudé wrote: >>> On 9/1/21 5:21 PM, Daniel P. Berrangé wrote: >>>> On Wed, Sep 01, 2021 at 04:17:48PM +0100, Peter Maydell wrote: >>>>> On Wed, 1 Sept 2021 at 15:59, Daniel P. Berrangé <berra...@redhat.com> >>>>> wrote: >>>>>> >>>>>> On Wed, Sep 01, 2021 at 04:52:29PM +0200, Philippe Mathieu-Daudé wrote: >>>>>>> Properly escape git-describe 'match' pattern to avoid (MinGW): >>>>>>> >>>>>>> $ if grep -q "EXESUF=.exe" config-host.mak; then make installer; >>>>>>> version="$(git describe --match v[0-9]*)"; >>>>>>> mv -v qemu-setup*.exe qemu-setup-${version}.exe; fi >>>>>>> fatal: No names found, cannot describe anything. >>>>>>> ERROR: Job failed: exit code 1 >>>>>>> >>>>>>> Reported-by: Cédric Le Goater <c...@kaod.org> >>>>>>> Fixes: 8619b5ddb56 ("ci: build & store windows installer") >>>>>>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/591 >>>>>>> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> >>>>>>> --- >>>>>>> .gitlab-ci.d/crossbuild-template.yml | 2 +- >>>>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>>>> >>>>>>> diff --git a/.gitlab-ci.d/crossbuild-template.yml >>>>>>> b/.gitlab-ci.d/crossbuild-template.yml >>>>>>> index 10d22dcf6c1..62d33e6661d 100644 >>>>>>> --- a/.gitlab-ci.d/crossbuild-template.yml >>>>>>> +++ b/.gitlab-ci.d/crossbuild-template.yml >>>>>>> @@ -14,7 +14,7 @@ >>>>>>> - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS >>>>>>> - if grep -q "EXESUF=.exe" config-host.mak; >>>>>>> then make installer; >>>>>>> - version="$(git describe --match v[0-9]*)"; >>>>>>> + version="$(git describe --match 'v[0-9]*')"; >>>>>> >>>>>> Do you have a pointer to a pipeline showing this fix works ? >>> >>> It worked on my fork but I have some versioned tag: >>> https://gitlab.com/philmd_rh/qemu/-/jobs/1553450025 >> >> I can reproduce the error msg if I do a shallow clone with no history >> >> $ cd qemu >> $ git describe --match v[0-9]* >> v6.1.0-171-g5e8c1a0c90 >> >> $ cd .. >> $ git clone --depth 1 https://gitlab.com/qemu-project/qemu/ qemu.new >> $ cd qemu.new/ >> $ git describe --match v[0-9]* >> fatal: No names found, cannot describe anything. >> >> but the odd thing is that I think we should have been hitting the >> problem frequently if it was related to git depth. This job passes >> fine in current CI pipelines and my own fork. > > FYI it didn't work out on Cédric fork: > https://gitlab.com/legoater/qemu/-/jobs/1553492082 >
Indeed. Thanks Phil, C.