From patchwork Fri Feb 4 20:43:22 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: 539890 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3572908imr; Fri, 4 Feb 2022 13:03:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9eWb2mglZGEb1SnObjAURzhFKXToopTtC+2f9j1YykmFyD7gBeMoFQsIUU/B2bSHFXoyf X-Received: by 2002:a25:3456:: with SMTP id b83mr1057837yba.648.1644008639563; Fri, 04 Feb 2022 13:03:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008639; cv=none; d=google.com; s=arc-20160816; b=b4V6UcCup+XMs4lfP9N3vp0GFw7JJKq7p6V7un9CAkgnylWYnOLWa88nCcf6T5lafw mQSzry+7wNTI3R2kgJWG/oyXZNDXkKz5EiMjhmWMTvqb5snNnCJvSww0341Q2riKTSur OelvmJVCd4JpG3bawckYeVfMyNIV2Qn3BlcNUx0o7r7jv9qaYDOdG4j6P+hQi97PSEWQ EbtOmn42YD0IbyFLiDbnQFLB3tSK0R1qUpSICrhfqs0IrUUhxJ+0kpvsPC3tuAeC8XBP DAjI4shfr+0nm9FzRlgGHrqGJVlmbNtjTmvuOjVyd3dXp9IfuI3q67KGl1XLd8nAfelp 7N3A== 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=PFUAsUoSTLSeQuqg2QwwUHrYnKbfkML1QApeyrZ65Rw=; b=Q18pbSgK7It+WiInw7p5SJ5EB/TyjmfKt2CJsLJ8CyWZS9ZclE9QOQ3zkqb/I29cPG CHBrVXE6SJibuDdOR46tuBDYqaK11Jrc7dgKTlsLeAxScgZ+X+UdUS6hK13XwIJHrrfQ AP6RWVJs1UomDiH8SKvkkVcwFdyISjfbUJloQ8lmg6W21rEpHWs/bJ8qUqB1GH+WiDrS ZYvhUS8QLs/7pPtd08iD+4mhGgauKl8EabbOm4jhFZAV7PodFiHtS4lhrgU6Yd5uXlzc 6uVF1HOje+ZkhUHVRT5AoyHQuM422s6pim4FJcoJmpM9z8HdCP+n1MGaLTM2Ee/nvv+8 4mpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RKvh4ljn; 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 u130si2155206ywc.492.2022.02.04.13.03.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 13:03:59 -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=RKvh4ljn; 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]:34604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5kN-00024R-2h for patch@linaro.org; Fri, 04 Feb 2022 16:03:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5R3-0006qN-Bo for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:44:01 -0500 Received: from [2a00:1450:4864:20::436] (port=39535 helo=mail-wr1-x436.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5R1-0007Oe-B3 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:44:01 -0500 Received: by mail-wr1-x436.google.com with SMTP id r17so4364256wrr.6 for ; Fri, 04 Feb 2022 12:43:58 -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=PFUAsUoSTLSeQuqg2QwwUHrYnKbfkML1QApeyrZ65Rw=; b=RKvh4ljnjZ7g5fAZsfYOhXqyl2TwCFsUr8YX3mahDLRLnYTBu7dvxH3DGtsLIXAD9e 3RcKPPOGc8/HTx5rBYR+7YwSnuDdMDOcOx0viVgGfCgyjSMbUDG6dRBjfOlt+BcUHFEe fZb2E/6+hL/c19SyFnA6hPYd7PVaHbWDmkZYnU7kDMpHYYhQ4RL1HvFxiUYSdoCzlcw0 Tq22WPq1CA0XM/Lyt8KybfJuRI7STFCotaTfVfOnQdTE191OMSR4jjDDGQEO4vuqL6z8 c+Bas8RVIysroFLAnFe1qux82TAZJ6SZFKpTRVI/8ZuxD5/RRqBr1LfSBYfDIxoHSpSC kJRw== 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=PFUAsUoSTLSeQuqg2QwwUHrYnKbfkML1QApeyrZ65Rw=; b=VGusM5mX5QYp74MtSE8ts/JDXU3+eJ0sKfcL9IIoIwqD1Vj4TNwNw84NK8ySsLYQ/9 /28Er0g4fcAKAuS0iE4GVm+W+K5VxOEF//qmNIoHTWdtmshu2Irk140QznSqYT4c1pN6 V32xDYc56k+w+a/m44rXU79iB3caDQodFE83zevd+m9uyIL9uHRG16A/0S5NfxcAdLxU a1kz+VizR4FDCkmDmDsl/FjuDoZNDr5uTlE4NWpmvY3QIiPgcki4cDK01PoLKS3r3sgx 5YeoXWk8iyRH+igN72yk1yCkT+Yrg/8W59LkRdrnn6JdkoMUWI5HcYEwHhUwlTXQrKFy cgwA== X-Gm-Message-State: AOAM533vzOoZB5E3ZcRyH8z9sFuZ/zbPXsU+YOwXbRt4fK7CKBN2e+Ph X/zvFgQRAFL5bPye1WH3BwhDxg== X-Received: by 2002:a05:6000:1848:: with SMTP id c8mr494163wri.241.1644007437993; Fri, 04 Feb 2022 12:43:57 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m14sm3892392wrp.4.2022.02.04.12.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:53 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6965B1FFC5; Fri, 4 Feb 2022 20:43:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 13/26] gitlab: fall back to commit hash in qemu-setup filename Date: Fri, 4 Feb 2022 20:43:22 +0000 Message-Id: <20220204204335.1689602-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::436 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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: fam@euphon.net, stefanha@redhat.com, mahmoudabdalghany@outlook.com, Gerd Hoffmann , minyihh@uci.edu, Wainer dos Santos Moschetta , aaron@os.amperecomputing.com, cota@braap.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Thomas Huth , Greg Kurz , Luke.Craig@ll.mit.edu, crosa@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn=C3=A9e?= , berrange@redhat.com, Beraldo Leal , f4bug@amsat.org, robhenry@microsoft.com, pbonzini@redhat.com, ma.mandourr@gmail.com, aurelien@aurel32.net 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 --- .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 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