]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
gitlab-ci.yml: Fix the filtering for the git submodules
authorThomas Huth <thuth@redhat.com>
Thu, 1 Apr 2021 10:25:29 +0000 (11:25 +0100)
committerAlex Bennée <alex.bennee@linaro.org>
Tue, 6 Apr 2021 14:04:49 +0000 (15:04 +0100)
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>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210331073316.2965928-1-thuth@redhat.com>
Message-Id: <20210401102530.12030-11-alex.bennee@linaro.org>

.gitlab-ci.yml

index 3480d79db3a3aeff792a242a5fda275e8dd80038..85b8e10b8416e6cfed2e7cc3f24a91854e5e034e 100644 (file)
@@ -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=":"