[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/11] gitlab-ci.yml: Fix the filtering for the git submodules
From: |
Alex Bennée |
Subject: |
[PULL 10/11] gitlab-ci.yml: Fix the filtering for the git submodules |
Date: |
Tue, 6 Apr 2021 16:00:40 +0100 |
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>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210331073316.2965928-1-thuth@redhat.com>
Message-Id: <20210401102530.12030-11-alex.bennee@linaro.org>
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
- [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub), Alex Bennée, 2021/04/06
- [PULL 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64, Alex Bennée, 2021/04/06
- [PULL 08/11] docs/system/gdb.rst: Add some more heading structure, Alex Bennée, 2021/04/06
- [PULL 03/11] tests/tcg: add concept of container_hosts, Alex Bennée, 2021/04/06
- [PULL 05/11] tests/tcg/i386: expand .data sections for system tests, Alex Bennée, 2021/04/06
- [PULL 01/11] tests/tcg: update the defaults for x86 compilers, Alex Bennée, 2021/04/06
- [PULL 10/11] gitlab-ci.yml: Fix the filtering for the git submodules,
Alex Bennée <=
- [PULL 06/11] tests/tcg/i386: force -fno-pie for test-i386, Alex Bennée, 2021/04/06
- [PULL 04/11] tests/tcg/configure.sh: make sure we pick up x86_64 cross compilers, Alex Bennée, 2021/04/06
- [PULL 11/11] gitlab-ci.yml: Test the dtrace backend in one of the jobs, Alex Bennée, 2021/04/06
- [PULL 09/11] docs/system/gdb.rst: Document how to debug multicore machines, Alex Bennée, 2021/04/06
- [PULL 07/11] tests/tcg: relax the next step precision of the gdb sha1 test, Alex Bennée, 2021/04/06
- Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub), Peter Maydell, 2021/04/06
- Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub), Alex Bennée, 2021/04/07
- Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub), Peter Maydell, 2021/04/07
- Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub), Alex Bennée, 2021/04/07
- Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub), Peter Maydell, 2021/04/08