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=-20.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,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 409F0C4320A for ; Wed, 1 Sep 2021 16:57:35 +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 AB97460FDC for ; Wed, 1 Sep 2021 16:57:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AB97460FDC 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]:33308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLTYL-0001ky-TQ for qemu-devel@archiver.kernel.org; Wed, 01 Sep 2021 12:57:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLTPV-0001Qg-Is for qemu-devel@nongnu.org; Wed, 01 Sep 2021 12:48:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLTPL-0001kJ-Ih for qemu-devel@nongnu.org; Wed, 01 Sep 2021 12:48:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630514893; h=from:from:reply-to: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=Fejlu0ee61WOZKLYpDj0T2CPxUe7TEeTUYy/7Of0fYo=; b=jJydtX7PvwRCdMRzDqrmks5xKFB9rv8xsLhdp9OHvwNm9WXQodWscK0Irmf59LcMQQmNBy rY1Bjdjkwh0FOzEGKiR5PnV10mnbD6fZibKwPA4TFHsW5VstIq4Kq9OzjzB1xbBgLutjKB wTZ/ITPyLrK53dGM6el2FG//wDiDn7Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-241-TqgujZOnP4-yd71YRGf15g-1; Wed, 01 Sep 2021 12:48:06 -0400 X-MC-Unique: TqgujZOnP4-yd71YRGf15g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9DA25519F; Wed, 1 Sep 2021 16:48:05 +0000 (UTC) Received: from redhat.com (unknown [10.39.193.162]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1350260C9F; Wed, 1 Sep 2021 16:47:46 +0000 (UTC) Date: Wed, 1 Sep 2021 17:47:44 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: =?utf-8?Q?C=C3=A9dric?= Le Goater Subject: Re: [PATCH] gitlab: Escape git-describe match pattern on Windows hosts Message-ID: 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> MIME-Version: 1.0 In-Reply-To: <005033c9-ac86-7af2-203d-0c597cec691c@kaod.org> User-Agent: Mutt/2.0.7 (2021-05-04) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.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, 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Peter Maydell , Thomas Huth , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , QEMU Developers , Wainer dos Santos Moschetta , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Willian Rampazzo , Gerd Hoffmann , Alex =?utf-8?Q?Benn=C3=A9e?= , Eric Blake Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Sep 01, 2021 at 06:27:37PM +0200, 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. > > > > FYI it didn't work out on Cédric fork: > > https://gitlab.com/legoater/qemu/-/jobs/1553492082 > > > > Indeed. I'm curious if you go to https://gitlab.com/legoater/qemu/-/settings/ci_cd and expand "General pipelines", what value is set for the "Git shallow clone" setting. In my fork it is 0 which means unlimited depth, but in gitlab docs I see reference to repos getting this set to 50 since a particular gitlab release. Likewise same question for Phil in ? https://gitlab.com/philmd_rh/qemu/-/settings/ci_cd Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|