From nobody Mon Apr 29 15:37:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1630507955; cv=none; d=zohomail.com; s=zohoarc; b=du8PKiXB23KLz3lfqgSY3cC+DMKb6yzu4LespGXjFTU1WuhiigyllGwjT9gT5ImL7mSzQvrO3WCqeloP4buYbq2mGgBnK/NrNy3Zn5W//coR+1xOorp7deeo3uMAjKQHw0nTw+MfD2nDJK1NpWrqachJ+ezZvsVyiY+sP+JMIZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630507955; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=iU0AWSYp5g/9uAso73aflh2bMzazgJNKHhtj5zCkHAY=; b=UojaN2qwgfjskNpBTCgMPz7n/m9e5xpvhWN6KgTAQHHMusPGjDz/lDi6coaW3PtYa1dIDp9uTTlVih0yumTCsfTIKMUf2Co2dSw/ynlSwsIWrWZq7dM61TO7Sonm4dQYiMw3p3Z2ZEnADns/Ntca2TXcE9YtRFZTzSbu0W0pxf0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1630507955496288.5829541632638; Wed, 1 Sep 2021 07:52:35 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-465-6wo-wDSaNxqvIUOEfChsWQ-1; Wed, 01 Sep 2021 10:52:33 -0400 Received: by mail-wm1-f72.google.com with SMTP id p11-20020a05600c204b00b002f05aff1663so1139095wmg.2 for ; Wed, 01 Sep 2021 07:52:33 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id n18sm5386279wmc.22.2021.09.01.07.52.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Sep 2021 07:52:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630507954; 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; bh=iU0AWSYp5g/9uAso73aflh2bMzazgJNKHhtj5zCkHAY=; b=OZbNtNYhMjBz9ogidJuKXq0bnmaqZbfGGZo7Dv4nyAoDUrwmmGsl1834jTk7O4wycC9az6 8ZyPtPAXiB9MHYSXlJgbWzxAVSnXi8liJm3nGAbBVH28yfNG5XXChoP7JlwUdeC5Zh/ouo 3OSgOnagARqtRd5QMtBY1cgvTiDg6NI= X-MC-Unique: 6wo-wDSaNxqvIUOEfChsWQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iU0AWSYp5g/9uAso73aflh2bMzazgJNKHhtj5zCkHAY=; b=F+L5XWhZi9V9PBpPGiex1H53vzdVp6N0dYvp11H+Inyv2QIe9rvlcJPZJ9as9qxWhi O4tfYxLy0U1Y6SY+6ijzsfPwANC1Bx7CVgOc5YNTncGYsZmB1yean5NwC+EdQVRMf6TZ 4kG8ZUv/YPOBxPuxoUt9h13FPJcorA7NXE6f20jfphaH6njKe7ilGM3Gun2VWNMlO/7G N7z77QmWb93a0Jg/GPRTFIS9QqdSAbGjX3LlKTpNpoiYSQj+bV+KxtoXBXxjuURab4dK jX7N2HKzFxZdm7Bf/8ayO+7p9LSLix33TWCL8FBZ6i1KXFO+M8LvDHhrO5DLlllCPHpd JtWQ== X-Gm-Message-State: AOAM532DK4hp0hpXwo4cIIj91WB13xbDKxs/WdMQCEAFcPW0bOrMNIZF tMxaNYbQd/5W+qQyLUGcOVo/w3V/C4/wXhTY9Tb2Y6vxGjBhtXcQ2QR83ZmvkxT4Iu6BIdQTBEQ o6w4JR1THsXbZVQ== X-Received: by 2002:adf:b318:: with SMTP id j24mr38077968wrd.84.1630507952118; Wed, 01 Sep 2021 07:52:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKP0voll36jFuHV1getjNpIEJDmKo+VPp9lc0fo1MnGe8DqD/0Gyr8jKZRg1bGdL42Ko0PgQ== X-Received: by 2002:adf:b318:: with SMTP id j24mr38077949wrd.84.1630507951946; Wed, 01 Sep 2021 07:52:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Eric Blake , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH] gitlab: Escape git-describe match pattern on Windows hosts Date: Wed, 1 Sep 2021 16:52:29 +0200 Message-Id: <20210901145229.4132606-1-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630507957413100003 Properly escape git-describe 'match' pattern to avoid (MinGW): $ if grep -q "EXESUF=3D.exe" config-host.mak; then make installer; version=3D"$(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=C3=A9dric Le Goater Fixes: 8619b5ddb56 ("ci: build & store windows installer") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/591 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .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=3D.exe" config-host.mak; then make installer; - version=3D"$(git describe --match v[0-9]*)"; + version=3D"$(git describe --match 'v[0-9]*')"; mv -v qemu-setup*.exe qemu-setup-${version}.exe; fi =20 --=20 2.31.1