diff options
| author | Guy Harris <gharris@sonic.net> | 2021-02-16 00:33:50 -0800 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2021-02-16 09:00:12 +0000 |
| commit | 9ffb0f27c8eeda2e1fe9d65d8d47e12d973ad811 (patch) | |
| tree | 3ec21e29e9a45a6199a766c59803aea39879b7e7 /.gitlab-ci.yml | |
| parent | 23a5f6a17767c39a7ed04df438ae3b4bf1fe90d8 (diff) | |
GitHub CI, CMake: override the definition of cmake_build.
Overriding the definition of the rpmbuild macro cmake_build on the
command line, so that it doesn't include the string "--verbose", should
prevent cmake --build from being run with --verbose, and thus prevent it
from running Ninja with the -v flag, and thus prevent a bunch of extra
noisy output from being produced for every build command, and thus
prevent the build log from hitting GitLab's 4MB limit.
Unlike piping the output of "ninja rpm-package" to sed, this means that
the exit status of "ninja rpm-package", rather than the exit status of
sed, is tested.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49b38ac6f2..c70d668ef2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,11 +164,9 @@ build:rpm-fedora: script: # Shared GitLab runners limit the log size to 4M, so reduce verbosity. See # https://gitlab.com/gitlab-com/support-forum/issues/2790 - # We do this by piping the output of "ninja rpm-package" through - # sed, to strip out all the -W and -f options from lines - # containing /usr/bin/gcc. + - export FORCE_CMAKE_NINJA_NON_VERBOSE=1 - cmake3 -GNinja .. - - ninja rpm-package | sed -e '/\/usr\/bin\/gcc/s/ -W[a-zA-Z0-9-]*//' -e '/\/usr\/bin\/gcc/s/ -f[a-zA-Z0-9-]*//' + - ninja rpm-package needs: - build:ubuntu-dist test:rpm-fedora: |