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 C45AAC432BE for ; Wed, 1 Sep 2021 14:58:25 +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 5D06960BD3 for ; Wed, 1 Sep 2021 14:58:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5D06960BD3 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]:51950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLRh2-0002IP-96 for qemu-devel@archiver.kernel.org; Wed, 01 Sep 2021 10:58:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLRgN-0001a6-Or for qemu-devel@nongnu.org; Wed, 01 Sep 2021 10:57:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:26871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLRgL-0003uD-F8 for qemu-devel@nongnu.org; Wed, 01 Sep 2021 10:57:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630508259; 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=SczuT2eMlYForwD5qO1QgmU+AXg+jJ62k2GnEQOngvQ=; b=Hn0jL51P7DuZTkAPQAR/MOIRJY9N6B2nhDju3vc/9VcPH49GAGueFyyzphErmRnluPVIib hAezWFc3d54KkwqMFbvQct7qsTetg3FGFhAfB0/h/pu83CuYjUWKdcUuaEyTHQm748hcOi oy6ae05mP+X0qhshoXtlPpRpWYMIC/Q= 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-28-TFnFF7oROQCFkBigl7LREg-1; Wed, 01 Sep 2021 10:57:33 -0400 X-MC-Unique: TFnFF7oROQCFkBigl7LREg-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 EB07B801A92; Wed, 1 Sep 2021 14:57:30 +0000 (UTC) Received: from redhat.com (unknown [10.39.193.162]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 586A560C05; Wed, 1 Sep 2021 14:57:17 +0000 (UTC) Date: Wed, 1 Sep 2021 15:57:14 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: Re: [PATCH] gitlab: Escape git-describe match pattern on Windows hosts Message-ID: References: <20210901145229.4132606-1-philmd@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210901145229.4132606-1-philmd@redhat.com> 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=170.10.133.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: Thomas Huth , Alex =?utf-8?Q?Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Willian Rampazzo , Gerd Hoffmann , Eric Blake , =?utf-8?Q?C=C3=A9dric?= Le Goater Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 is a bit strange to me. AFAICT, the only difference would be if the unquoted v[0-9]* matched a filename in the current directory, but that doesn't seem like it is the case here. Are you sure this isn't just caused by the setting container-cross.yml: GIT_DEPTH: 1 ie we don't have the history depth needed to find any of the historic git tags. 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 :|