| Message ID | 20210331073316.2965928-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | gitlab-ci.yml: Fix the filtering for the git submodules | expand |
On Wed, Mar 31, 2021 at 4:33 AM Thomas Huth <thuth@redhat.com> wrote: > > 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> > --- > .gitlab-ci.yml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Thomas Huth <thuth@redhat.com> writes: > 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> Queued to for-6.0/fixes-for-rc2, thanks.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 148320ec91..ebf3f80a39 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,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=":"
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> --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)