From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 458E9C432BE for ; Wed, 1 Sep 2021 16:51:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A0C1D60525 for ; Wed, 1 Sep 2021 16:51:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A0C1D60525 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:41036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLTSL-0004kn-Sf for qemu-devel@archiver.kernel.org; Wed, 01 Sep 2021 12:51:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLTHW-0002z7-Rg for qemu-devel@nongnu.org; Wed, 01 Sep 2021 12:40:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35180) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLTHS-0003Ss-QM for qemu-devel@nongnu.org; Wed, 01 Sep 2021 12:40:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630514405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Cv5hXyN0h5cm2EJc51fpl0EwQG9YlE4asvFKJtyDkE=; b=MWibK1fCjyCAW7nC1fiO5KK7ZumGr6UsKQJ4qin6Sux3Bv83ifYE4dZqtN1Ovf4RznOCdd xy4bIgwE3jZWCyyVGomSwMjimues1Co5gIsxJsLihX4H8lvmFbEkT1UkxsY/ILOrga0cZp FIEkELisfmbIWej5hzoK+JWXqan2i80= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-38-oiVNal28MUWy289yRfvMyA-1; Wed, 01 Sep 2021 12:40:03 -0400 X-MC-Unique: oiVNal28MUWy289yRfvMyA-1 Received: by mail-wm1-f71.google.com with SMTP id f19-20020a1c1f13000000b002e6bd83c344so48062wmf.3 for ; Wed, 01 Sep 2021 09:40:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=/Cv5hXyN0h5cm2EJc51fpl0EwQG9YlE4asvFKJtyDkE=; b=nb0BHeChcNufuIU2m9bMcy3gsHejv3Em6aeseftU00n5sQakqw6Fa979c3gd88XK33 7wVmCaEOPHZziiOjKNlJmD0ebtBNW5mqkHYsVIb+LCisC8dx5HEVlB7ALFuWi/aOp3tL 8+vjzkAY3MWfZmwHxOmr+mPNUOZQ1EXrw8YBUlklXWZqjN15hjdLC0RA6IbXxRlhOEO1 N0tO6/j/ZwDX/vIFhdI4h8Vp409yG/fW27P2cO3S9Np+FS5X6jBg4kd0aTRk6REunzOZ DHBCSxbbh60nnsMnM5Zm5hTMBOD9sVdDueo0Eicm2OG0r4S7IbwnICsVP+4PMUVYN92Q vloA== X-Gm-Message-State: AOAM533D98s7ae+WdrU5DB0rtrWt9RNQLoSX02wE1zLIjSdIxwYYg2HO mQ49hdvXxSCUkZeCe+VAR4mOjgdTVI0uFDriw8CoEYKhtNjly09IsaoxX52Rw0nrDU82+N18BDc ExwMyRkaXHHmh1aY= X-Received: by 2002:a7b:cc0a:: with SMTP id f10mr388932wmh.32.1630514401834; Wed, 01 Sep 2021 09:40:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvjluswrxvD7nCo+W8rK6rGInCsN+i3oFeUwlULrmJ7c3loyn/gG4w8/IK34E3VcjZxHsdpA== X-Received: by 2002:a7b:cc0a:: with SMTP id f10mr388900wmh.32.1630514401569; Wed, 01 Sep 2021 09:40:01 -0700 (PDT) Received: from [192.168.1.36] (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id i4sm33966wmd.5.2021.09.01.09.40.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Sep 2021 09:40:01 -0700 (PDT) Subject: Re: [PATCH] gitlab: Escape git-describe match pattern on Windows hosts To: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= References: <20210901145229.4132606-1-philmd@redhat.com> <0901f6da-de5c-f9e6-5f40-e15f4a7c807d@redhat.com> <33d1a40b-c242-6472-5aa4-4108668ccc84@redhat.com> <005033c9-ac86-7af2-203d-0c597cec691c@kaod.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <15e90d82-b4bb-f588-bca5-e53abe16b8f7@redhat.com> Date: Wed, 1 Sep 2021 18:40:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <005033c9-ac86-7af2-203d-0c597cec691c@kaod.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.392, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-1.029, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eric Blake , QEMU Developers , Wainer dos Santos Moschetta , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Willian Rampazzo , Gerd Hoffmann , =?UTF-8?Q?Alex_Benn=c3=a9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 9/1/21 6:27 PM, Cédric Le Goater wrote: > 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é 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 >>>>>>>> Fixes: 8619b5ddb56 ("ci: build & store windows installer") >>>>>>>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/591 >>>>>>>> Signed-off-by: Philippe Mathieu-Daudé >>>>>>>> --- >>>>>>>> .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. What about not using the best tag if no versioned tag available? (no default string in case user wants to download and archive artifacts) -- >8 -- @@ -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 --tags --match 'v[0-9]*' 2>/dev/null || git describe --abbrev)"; mv -v qemu-setup*.exe qemu-setup-${version}.exe; fi --- >> FYI it didn't work out on Cédric fork: >> https://gitlab.com/legoater/qemu/-/jobs/1553492082 >> > > Indeed. > > Thanks Phil, > > C. >