From patchwork Wed Feb 9 14:15:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541104 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1414597imo; Wed, 9 Feb 2022 07:04:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwqlPg6lCseFsUIVrtts3WtquHTEPD+fe3NBT4lRmJWF8+a/vppiOgCAltPvgXdZBkoCp1 X-Received: by 2002:a5b:e83:: with SMTP id z3mr1519050ybr.318.1644419041420; Wed, 09 Feb 2022 07:04:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644419041; cv=none; d=google.com; s=arc-20160816; b=g+0keCvoLgnSCZUUoDiHRTJozeWnBAy3FybxtY+6WYYGYHTwshaGrywxnfGoO+E4zw LPgHuhUUc5pqn0OHa7YQDMuPd4vh42wSuLuPL4dBpYQAQn+zUHsOqIObUlTmF+UDR9z3 QfNFLjYvLnYx+0rAsvJ64n1ui1cr9NiVqI3qcuWpN3LoHJhREsbGs3zxPUe4dAW6c3bb HBYvJvkhjjtUszShcTHsR3sn+/NCoidWewhqRcRxeN5HRZm3OS+g7W9aJQKbyAFNzYM4 Dvw/VQ1XoHldrowpRvrDToUexTvMVnSUp/CK4JioPdln1ywcnYkwL1Gd5YzvURmXHB9C LSCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=CVpYJY8/v7LNfM9dUETq5TipA+OkYAaNIcnr10j39ms=; b=yiWfkQmIxNdcDuztkBw/3DDYcKh2L4VbRrruROLcgFCqoHL4FehzVzYrHJTqQizgfL WjFdR9bsXQeu2y5XWrWcrCohEjWY6GpFw0MCph0KxLGHFqtzchWIm1SSvtbhIZouDtRt C7KfsEIFBx1jYIN/FZntvk0WGpaGjUlZkHpYwJLtTtdBKXGh5rh6Mn9rM1jQwCwlg0zY msw/2ouXi2z9mWKhcIu8xQ3e9NbYG96QJMHzqd5lR7y2Pi1UsdXV0H6KPg57I7cspsNR LYLCcnxMDSGo7YP3B+aUG1OYU3T55FE/zRu7c4APVxUzvjgna/YXb4ET+MAT2cl7eNEY 9jxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cbE7LVLc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o70si4626114ybg.455.2022.02.09.07.04.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:04:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cbE7LVLc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHoVk-0003Pe-QM for patch@linaro.org; Wed, 09 Feb 2022 10:04:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnuC-0000jf-4l for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:12 -0500 Received: from [2a00:1450:4864:20::330] (port=52817 helo=mail-wm1-x330.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnu8-0001NN-Ss for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:10 -0500 Received: by mail-wm1-x330.google.com with SMTP id v129so1592083wme.2 for ; Wed, 09 Feb 2022 06:25:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CVpYJY8/v7LNfM9dUETq5TipA+OkYAaNIcnr10j39ms=; b=cbE7LVLcdfW7eKfR/wPWVWl7KFudveAWtBAnc0BEVRvNjmHq7b7UeP8T5gxdK+xNz3 NAi7jIfPWiFtsFLSrkOd/h1enbp+DR6eDpsm5YiopLDlSkZQUVE4zFg01fuAu1LoYmCp vu9NQrgcPdXPxL91X9B5C3WYSyO0GP/Uj3TqArRUDgnh/l0wwkC7dHB+2cph2BRiLDAd KR/40dDnwysVtRNP1tZgQH1SZgfv9CwSBXCnE6ihufzpS8ZsIOHxfTlsoNBplrF0vbMr LN25zD99j37zUQjrh1Rv3DbG4OG53uEy8TnXBj4jtIn9hNEybt9ZxwYMxqEPH20FWkPV eUrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CVpYJY8/v7LNfM9dUETq5TipA+OkYAaNIcnr10j39ms=; b=ULdAFFR7bnW7AfyMhwtcvM46KwzNBN2lr/OQ9u8if4Mji3YFd0PlwzqKBPbXzyWzm1 PKZrEm9bZz/+MVwPTAYYptN69fXpCYoK4DQnggRLFa8ehw1zkMCFGb8tNTxjMUSra+sz l2pZGsmnw3EO3lnD20XljvrHybp+2Gt2/CgBo2S9Ql6bBf/qkvv7PZeHJxFgmJbCXzYZ 8Bc4M8cdi1gUfzqcmnICmtNyTYMruU1RK8MAau4tsXANGW87HVlBcbs6aZXA4F4cTeOp dtDdrdTgx0j7CJWYWTjmRYHyhhRZDbFWYbcKfU2//VnkCYSCfcZ83LloNgQ0CNJwhCuz 37/w== X-Gm-Message-State: AOAM533Ljg6Ibas1lEyfnl5ERooVNyNfTR81HUSptlIFNQY0+pNV79oE eyBopLB/KgzttcCNH7lkCPOAIA== X-Received: by 2002:a05:600c:1e0e:: with SMTP id ay14mr2767515wmb.118.1644416705011; Wed, 09 Feb 2022 06:25:05 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm8989473wrc.41.2022.02.09.06.24.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7471F1FFC5; Wed, 9 Feb 2022 14:15:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 13/28] gitlab: fall back to commit hash in qemu-setup filename Date: Wed, 9 Feb 2022 14:15:14 +0000 Message-Id: <20220209141529.3418384-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::330 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Greg Kurz , Gerd Hoffmann , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Stefan Hajnoczi Personal repos may not have release tags (v6.0.0, v6.1.0, etc) and this causes cross_system_build_job to fail when pretty-printing a unique qemu-setup-*.exe name: version="$(git describe --match v[0-9]*)"; ^^^^^^^^^^ fails ^^^^^^^^^^^ mv -v qemu-setup*.exe qemu-setup-${version}.exe; Fall back to the short commit hash if necessary. This fixes CI failures that Greg Kurz and I experienced in our personal repos. Cc: Greg Kurz Cc: Gerd Hoffmann Cc: Philippe Mathieu-Daudé Signed-off-by: Stefan Hajnoczi Reviewed-by: Greg Kurz Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220125173454.10381-1-stefanha@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220204204335.1689602-14-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml index 10d22dcf6c..29c3c2b826 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]* 2>/dev/null || git rev-parse --short HEAD)"; mv -v qemu-setup*.exe qemu-setup-${version}.exe; fi