frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Use $FDO_CI_CONCURRENT if set 

To take advantage of more than 4 CPU cores available to the container.

Acked-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Michel Dänzer 2020-09-16 12:55:35 +02:00 committed by Michel Dänzer
parent 28ed4b95e9
commit 9a7515943f
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

@ -16,7 +16,7 @@
variables: variables:
UPSTREAM_REPO: xorg/xserver UPSTREAM_REPO: xorg/xserver
DEBIAN_VERSION: testing-slim DEBIAN_VERSION: testing-slim
DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
DEBIAN_TAG: "2020-04-21" DEBIAN_TAG: "2020-04-21"
IMAGE_LOCAL: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG" IMAGE_LOCAL: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
@ -70,8 +70,8 @@ autotools:
- mkdir build/ - mkdir build/
- cd build/ - cd build/
- ../autogen.sh --prefix=/usr CFLAGS="-fno-common" - ../autogen.sh --prefix=/usr CFLAGS="-fno-common"
- make -j4 distcheck - make -j${FDO_CI_CONCURRENT:-4} distcheck
- PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts make -j4 check - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts make -j${FDO_CI_CONCURRENT:-4} check
- cd .. - cd ..
- .gitlab-ci/manpages-check - .gitlab-ci/manpages-check
@ -82,8 +82,8 @@ meson:
XTEST_DIR: /root/xts XTEST_DIR: /root/xts
script: script:
- meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS build/ - meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS build/
- ninja -j4 -C build/ install - ninja -j${FDO_CI_CONCURRENT:-4} -C build/ install
- ninja -j4 -C build/ test - ninja -j${FDO_CI_CONCURRENT:-4} -C build/ test
- .gitlab-ci/manpages-check - .gitlab-ci/manpages-check
meson-noglamor: meson-noglamor:

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

@ -34,13 +34,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 -j4 xvfb-run make -j${FDO_CI_CONCURRENT:-4}
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 -j4 -C build install ninja -j${FDO_CI_CONCURRENT:-4} -C build install
cd .. cd ..
rm -rf piglit/.git xts/.git piglit/tests/spec/ rm -rf piglit/.git xts/.git piglit/tests/spec/