From: "Alex Bennée" <alex.bennee@linaro.org> To: qemu-devel@nongnu.org Cc: fam@euphon.net, "Thomas Huth" <thuth@redhat.com>, berrange@redhat.com, f4bug@amsat.org, "Wainer dos Santos Moschetta" <wainersm@redhat.com>, "Willian Rampazzo" <willianr@redhat.com>, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, "Alex Bennée" <alex.bennee@linaro.org>, aurelien@aurel32.net Subject: [PATCH v2 10/11] gitlab-ci.yml: Fix the filtering for the git submodules Date: Thu, 1 Apr 2021 11:25:29 +0100 [thread overview] Message-ID: <20210401102530.12030-11-alex.bennee@linaro.org> (raw) In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> From: Thomas Huth <thuth@redhat.com> 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 <thuth@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20210331073316.2965928-1-thuth@redhat.com> --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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=":" -- 2.20.1
next prev parent reply other threads:[~2021-04-01 10:34 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-01 10:25 [PATCH for 6.0-rc2 v2 00/11] various fixes, pre-PR (check-tcg, gdbstub, gitlab) Alex Bennée 2021-04-01 10:25 ` [PATCH v2 01/11] tests/tcg: update the defaults for x86 compilers Alex Bennée 2021-04-06 10:29 ` Philippe Mathieu-Daudé 2021-04-01 10:25 ` [PATCH v2 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64 Alex Bennée 2021-04-01 10:25 ` [PATCH v2 03/11] tests/tcg: add concept of container_hosts Alex Bennée 2021-04-02 16:23 ` Richard Henderson 2021-04-06 11:16 ` Philippe Mathieu-Daudé 2021-04-01 10:25 ` [PATCH v2 04/11] tests/tcg/configure.sh: make sure we pick up x86_64 cross compilers Alex Bennée 2021-04-02 16:26 ` Richard Henderson 2021-04-06 9:46 ` Alex Bennée 2021-04-01 10:25 ` [PATCH v2 05/11] tests/tcg/i386: expand .data sections for system tests Alex Bennée 2021-04-01 10:25 ` [PATCH v2 06/11] tests/tcg/i386: force -fno-pie for test-i386 Alex Bennée 2021-04-02 16:27 ` Richard Henderson 2021-04-06 13:59 ` Alex Bennée 2021-04-01 10:25 ` [PATCH v2 07/11] tests/tcg: relax the next step precision of the gdb sha1 test Alex Bennée 2021-04-02 16:41 ` Richard Henderson 2021-04-02 18:38 ` Richard Henderson 2021-04-06 9:43 ` Alex Bennée 2021-04-01 10:25 ` [PATCH v2 08/11] docs/system/gdb.rst: Add some more heading structure Alex Bennée 2021-04-01 10:25 ` [PATCH v2 09/11] docs/system/gdb.rst: Document how to debug multicore machines Alex Bennée 2021-04-01 10:25 ` Alex Bennée [this message] 2021-04-01 14:17 ` [PATCH v2 10/11] gitlab-ci.yml: Fix the filtering for the git submodules Willian Rampazzo 2021-04-01 10:25 ` [PATCH v2 11/11] gitlab-ci.yml: Test the dtrace backend in one of the jobs Alex Bennée
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210401102530.12030-11-alex.bennee@linaro.org \ --to=alex.bennee@linaro.org \ --cc=aurelien@aurel32.net \ --cc=berrange@redhat.com \ --cc=crosa@redhat.com \ --cc=f4bug@amsat.org \ --cc=fam@euphon.net \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=stefanha@redhat.com \ --cc=thuth@redhat.com \ --cc=wainersm@redhat.com \ --cc=willianr@redhat.com \ --subject='Re: [PATCH v2 10/11] gitlab-ci.yml: Fix the filtering for the git submodules' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).