| Message ID | 20210401102530.12030-11-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | various fixes, pre-PR (check-tcg, gdbstub, gitlab) | expand |
On Thu, Apr 1, 2021 at 7:25 AM Alex Bennée <alex.bennee@linaro.org> wrote: > > 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(-) > Missing my review from the original patch, anyway: Reviewed-by: Willian Rampazzo <willianr@redhat.com>
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=":"