diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2019-12-23 09:35:09 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2020-01-06 15:52:24 +0100 |
| commit | 23b72d8e4b624ffd81a35e3b62be2430051a6ffa (patch) | |
| tree | e1ae8a184863e0272bb786d5be21d2be226e008a | |
| parent | 9107a610deb130d0e4ddee92d6ca9a08a8e103f3 (diff) | |
gitlab-ci: Use -j4 instead of -j$(proc)
The shared GitLab CI runners are configured for jobs making use of up
to 4 CPU cores, attempting to use more may overload them.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ea7c8e47..2ab7179e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: DEBIAN_VERSION: testing-slim DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' - DEBIAN_TAG: "2019-09-03" + DEBIAN_TAG: "2020-01-06" IMAGE_LOCAL: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG" include: @@ -70,8 +70,8 @@ autotools-build-and-test: - mkdir build/ - cd build/ - ../autogen.sh --prefix=/usr - - make -j$(nproc) distcheck - - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts make -j$(nproc) check + - make -j4 distcheck + - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts make -j4 check - cd .. - .gitlab-ci/manpages-check @@ -82,6 +82,6 @@ meson-build-and-test: XTEST_DIR: /root/xts script: - meson -Dprefix=/usr -Dxephyr=true build/ - - ninja -C build/ install - - ninja -C build/ test + - ninja -j4 -C build/ install + - ninja -j4 -C build/ test - .gitlab-ci/manpages-check diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index a17bccff2..176396316 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -20,13 +20,13 @@ git clone https://gitlab.freedesktop.org/mesa/piglit.git --depth 1 git clone https://gitlab.freedesktop.org/xorg/test/xts --depth 1 cd xts ./autogen.sh -xvfb-run make -j$(nproc) +xvfb-run make -j4 cd .. git clone https://gitlab.freedesktop.org/xorg/test/rendercheck --depth 1 cd rendercheck meson build -ninja -C build install +ninja -j4 -C build install cd .. rm -rf piglit/.git xts/.git |