andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gitlab-ci: Use -j4 instead of -j$(proc)

Browse Source 
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>
This commit is contained in:
Michel Dänzer 2019-12-23 09:35:09 +01:00 committed by Michel Dänzer
parent 9107a610de
commit 23b72d8e4b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -18,7 +18,7 @@ variables:
DEBIAN_VERSION: testing-slim DEBIAN_VERSION: testing-slim
DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' 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" IMAGE_LOCAL: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
include: include:
@ -70,8 +70,8 @@ autotools-build-and-test:
- mkdir build/ - mkdir build/
- cd build/ - cd build/
- ../autogen.sh --prefix=/usr - ../autogen.sh --prefix=/usr
- make -j$(nproc) distcheck - make -j4 distcheck
- PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts make -j$(nproc) check - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts make -j4 check
- cd .. - cd ..
- .gitlab-ci/manpages-check - .gitlab-ci/manpages-check
@ -82,6 +82,6 @@ meson-build-and-test:
XTEST_DIR: /root/xts XTEST_DIR: /root/xts
script: script:
- meson -Dprefix=/usr -Dxephyr=true build/ - meson -Dprefix=/usr -Dxephyr=true build/
- ninja -C build/ install - ninja -j4 -C build/ install
- ninja -C build/ test - ninja -j4 -C build/ test
- .gitlab-ci/manpages-check - .gitlab-ci/manpages-check

4
.gitlab-ci/debian-install.sh
View File

@ -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 git clone https://gitlab.freedesktop.org/xorg/test/xts --depth 1
cd xts cd xts
./autogen.sh ./autogen.sh
xvfb-run make -j$(nproc) xvfb-run make -j4
cd .. cd ..
git clone https://gitlab.freedesktop.org/xorg/test/rendercheck --depth 1 git clone https://gitlab.freedesktop.org/xorg/test/rendercheck --depth 1
cd rendercheck cd rendercheck
meson build meson build
ninja -C build install ninja -j4 -C build install
cd .. cd ..
rm -rf piglit/.git xts/.git rm -rf piglit/.git xts/.git