From patchwork Tue Apr 6 15:00:40 2021 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: 415922 Delivered-To: patch@linaro.org Received: by 2002:a17:906:5290:0:0:0:0 with SMTP id c16csp4410404ejm; Tue, 6 Apr 2021 08:08:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxe+mG7aNitm3D6lUh+m0koAbBgWn8MR6b/K+0W33s/lYFvzWWzjGYmd9JIikyamwJKso2 X-Received: by 2002:a05:6e02:504:: with SMTP id d4mr24604481ils.125.1617721721503; Tue, 06 Apr 2021 08:08:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617721721; cv=none; d=google.com; s=arc-20160816; b=kj0SLpFc1nj/AFSm/7IrPyCtclyXppJsiJ+g706xxbOMXJKMAX85DblxvAfK7I0F9s GGqi4peVg9Iqle4KApcj4Ee1VUINwD8Pyc/68wgYGJSCOtQZZytM8K38fpF2E/DNZ9m4 agfSTZpkOihDKRojDQPo3QbAggRVOI+pY0kO1hLxAKN8MTgKjEkoVXlo/bfzDt1Vkp7S mnDmhrznM+R0Sd9TJNYRapaHvPyDgDN3Fvo0osxnZ0t46qnL7+aQ60eog6q4eTUxwRZz 0sQfsZBx9US5EOJnuCuvmlpk4VQHd+YruUEeAvfZGtPgIKbkbdk4yzY9zLtSUGJ/ECz6 u1Aw== 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=PJghT1u+mp84Ea7Ui7/AalITSsrw07UnoILstoAi4rE=; b=IhXuLYtoABEl3bKsw8nvSceLAELwgp2acagK0tN8xe7tqt8RpvJzGja+qfZeJMJroq AUTBh5ggNaszzZuef/LWVUi+dDszvAKG6ZKGUIC2nvRslAJ9gtzVC8tUHUvO0ma3VffT SYRM0RYo1w89MHgC8B7mD5hFcBQCxW4LhzejD1w/FCFC+DRUz61zqkyBaPEP5sM194gd +lMMYureKU1n6hFlMPwLOUCR1px+S1pGei0/2M7jhZseNyixRjX7QLZeGSPZMXfFMEkv ybcOtS58e6AeuljK62XoTyEicXcQP9v3xFSQkL2/UCCMlzhXC7pfH81ipVewZrS2qj6u wxIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="n0/p/XQ4"; 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 f19si18100564jat.55.2021.04.06.08.08.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Apr 2021 08:08:41 -0700 (PDT) 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="n0/p/XQ4"; 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]:45600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTnJo-0005iE-Q5 for patch@linaro.org; Tue, 06 Apr 2021 11:08:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51342) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTnCR-0006Vl-4v for qemu-devel@nongnu.org; Tue, 06 Apr 2021 11:01:03 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33410) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTnCP-00058y-8x for qemu-devel@nongnu.org; Tue, 06 Apr 2021 11:01:02 -0400 Received: by mail-wr1-x429.google.com with SMTP id f12so8600752wro.0 for ; Tue, 06 Apr 2021 08:01:00 -0700 (PDT) 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=PJghT1u+mp84Ea7Ui7/AalITSsrw07UnoILstoAi4rE=; b=n0/p/XQ4vjcT7+oDY4e63rldkC8hu3gwPeD0KqKDy2ZNJ86FjeVXvtoslvh29oztc8 K4EOkBISVPNcqXoRwlirW37vgZYgdDkQLbXYMyhBoGtZdh2dw3IPQkXyCVxiA2RZN4Vy QtmODggwefvw80bBpkmif8N7I/zJlUFibor9w6DBrpmI3dfaSV257k8geP9JwPKQyBb7 orHpm8C2avASVhN7iCPOF5y5jUtox5P0jeYeVvHPm55WLWzR56jRu0ASpusWwir3bKOA TI5wL0luLMOGnRboG4rWJOksIcV81W4Wgto3xu+XiNRz8lMqIOqsssZSO3Wu2Vb/AV5B J7Sg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=PJghT1u+mp84Ea7Ui7/AalITSsrw07UnoILstoAi4rE=; b=kz0Le4dpQ1Hy6f69vvvmfHo9sUzRdGJplTNaru7LQtjk4WXRrJltzf1JIQwawZCsGM DgqwW/cLrFWBs9ndxOPDCz1JvSgQiD+eLvFu/NHFoYvBSBsaCn1bzlwHp50rLLjXxhGC 3eOE2lmFP4fhIbK3RnSIczgL1n06jljg80qjFAZpX77UC0feqZwuTWwGHtvspanQ614c N494oU0Kp/LLGrEkNG2idM9CALblFQRMoHSAFDPDxeEOEDZ4rN4Y4d/5KmBAYOpIWDGz 3ruKClakDeJl9Ng5kG8z6KhdBMqEEOgBrTt+HAgduMLS8rAKId9ZSlNVoAffZD9M3x2n aDZw== X-Gm-Message-State: AOAM5326C6tgKMOrpDzigz8Ac5FcoOCmjEWYWcmBwyUcgUwanA2RkVQU QKKp7E97IVCnK77BIhl1kSMOoA== X-Received: by 2002:adf:a15e:: with SMTP id r30mr17287378wrr.101.1617721259931; Tue, 06 Apr 2021 08:00:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g5sm33210970wrq.30.2021.04.06.08.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 08:00:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E9A8B1FF99; Tue, 6 Apr 2021 16:00:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/11] gitlab-ci.yml: Fix the filtering for the git submodules Date: Tue, 6 Apr 2021 16:00:40 +0100 Message-Id: <20210406150041.28753-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210406150041.28753-1-alex.bennee@linaro.org> References: <20210406150041.28753-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Cc: Thomas Huth , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Commit 7d7dbf9dc15be6e introduced a new line starting with "GIT_SUBMODULES_ACTION=" in the config-host.mak file. The grep that tries to determine the submodules in the gitlab-ci.yml file matches this new line, too, causing a warning message when updating the modules: warn: ignoring non-existent submodule GIT_SUBMODULES_ACTION=update Fix it by matching the "GIT_SUBMODULES=..." line only. Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Message-Id: <20210331073316.2965928-1-thuth@redhat.com> Message-Id: <20210401102530.12030-11-alex.bennee@linaro.org> -- 2.20.1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3480d79db3..85b8e10b84 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ include: image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: - scripts/git-submodule.sh update - $(grep GIT_SUBMODULES build/config-host.mak | sed 's/GIT_SUBMODULES=//') + $(sed -n '/GIT_SUBMODULES=/ s/.*=// p' build/config-host.mak) - cd build - find . -type f -exec touch {} + # Avoid recompiling by hiding ninja with NINJA=":"