system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-08 20:05:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Use appropriate parallelism for container builds

Browse Source 
The shared runners export ${FDO_CI_CONCURRENT} for the appropriate
number of CPUs we should use during our builds.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2021-06-21 20:36:48 +01:00
parent e4d8899b58
commit d98e3dadd4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -25,7 +25,7 @@ stages:
.debian:
variables:
FDO_DISTRIBUTION_VERSION: buster
FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh'
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
FDO_DISTRIBUTION_TAG: '2021-07-31.0-pipewire'
.ci-rules:

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

@ -2,6 +2,11 @@
set -o xtrace -o errexit
# Set concurrency to an appropriate level for our shared runners, falling back
# to the conservative default from before we had this variable.
export MAKEFLAGS="-j${FDO_CI_CONCURRENT:-4}"
export NINJAFLAGS="-j${FDO_CI_CONCURRENT:-4}"
# These get temporary installed for building Linux and then force-removed.
LINUX_DEV_PKGS="
bc
@ -109,7 +114,7 @@ make x86_64_defconfig
make kvmconfig
./scripts/config --enable CONFIG_DRM_VKMS
make oldconfig
make -j8
make
cd ..
mkdir /weston-virtme
mv linux/arch/x86/boot/bzImage /weston-virtme/bzImage
@ -134,7 +139,6 @@ git checkout -b snapshot 69e3cb83b3405edc99fcf9611f50012a4f210f78
cd ..
git clone --branch 1.18.0 --depth=1 https://gitlab.freedesktop.org/wayland/wayland
export MAKEFLAGS="-j4"
cd wayland
git show -s HEAD
mkdir build
@ -149,7 +153,7 @@ cd mesa
git checkout -b snapshot mesa-20.3.1
meson build -Dauto_features=disabled \
-Dgallium-drivers=swrast -Dvulkan-drivers= -Ddri-drivers=
ninja -C build install
ninja ${NINJAFLAGS} -C build install
cd ..
rm -rf mesa
@ -157,7 +161,7 @@ rm -rf pipewire
git clone --depth=1 --branch 0.3.31 https://gitlab.freedesktop.org/pipewire/pipewire.git pipewire
cd pipewire
meson build
ninja -C build install
ninja ${NINJAFLAGS} -C build install
cd ..
rm -rf pipewire
@ -166,7 +170,7 @@ cd seatd
meson build -Dauto_features=disabled \
-Dseatd=enabled -Dlogind=enabled -Dserver=enabled \
-Dexamples=disabled -Dman-pages=disabled
ninja -C build install
ninja ${NINJAFLAGS} -C build install
cd ..
rm -rf seatd