mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-09-06 01:43:43 +00:00
CI: Use appropriate parallelism for container builds
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:
parent
e4d8899b58
commit
d98e3dadd4
|
@ -25,7 +25,7 @@ stages:
|
||||||
.debian:
|
.debian:
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_VERSION: buster
|
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'
|
FDO_DISTRIBUTION_TAG: '2021-07-31.0-pipewire'
|
||||||
|
|
||||||
.ci-rules:
|
.ci-rules:
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
|
|
||||||
set -o xtrace -o errexit
|
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.
|
# These get temporary installed for building Linux and then force-removed.
|
||||||
LINUX_DEV_PKGS="
|
LINUX_DEV_PKGS="
|
||||||
bc
|
bc
|
||||||
|
@ -109,7 +114,7 @@ make x86_64_defconfig
|
||||||
make kvmconfig
|
make kvmconfig
|
||||||
./scripts/config --enable CONFIG_DRM_VKMS
|
./scripts/config --enable CONFIG_DRM_VKMS
|
||||||
make oldconfig
|
make oldconfig
|
||||||
make -j8
|
make
|
||||||
cd ..
|
cd ..
|
||||||
mkdir /weston-virtme
|
mkdir /weston-virtme
|
||||||
mv linux/arch/x86/boot/bzImage /weston-virtme/bzImage
|
mv linux/arch/x86/boot/bzImage /weston-virtme/bzImage
|
||||||
|
@ -134,7 +139,6 @@ git checkout -b snapshot 69e3cb83b3405edc99fcf9611f50012a4f210f78
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
git clone --branch 1.18.0 --depth=1 https://gitlab.freedesktop.org/wayland/wayland
|
git clone --branch 1.18.0 --depth=1 https://gitlab.freedesktop.org/wayland/wayland
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
cd wayland
|
cd wayland
|
||||||
git show -s HEAD
|
git show -s HEAD
|
||||||
mkdir build
|
mkdir build
|
||||||
|
@ -149,7 +153,7 @@ cd mesa
|
||||||
git checkout -b snapshot mesa-20.3.1
|
git checkout -b snapshot mesa-20.3.1
|
||||||
meson build -Dauto_features=disabled \
|
meson build -Dauto_features=disabled \
|
||||||
-Dgallium-drivers=swrast -Dvulkan-drivers= -Ddri-drivers=
|
-Dgallium-drivers=swrast -Dvulkan-drivers= -Ddri-drivers=
|
||||||
ninja -C build install
|
ninja ${NINJAFLAGS} -C build install
|
||||||
cd ..
|
cd ..
|
||||||
rm -rf mesa
|
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
|
git clone --depth=1 --branch 0.3.31 https://gitlab.freedesktop.org/pipewire/pipewire.git pipewire
|
||||||
cd pipewire
|
cd pipewire
|
||||||
meson build
|
meson build
|
||||||
ninja -C build install
|
ninja ${NINJAFLAGS} -C build install
|
||||||
cd ..
|
cd ..
|
||||||
rm -rf pipewire
|
rm -rf pipewire
|
||||||
|
|
||||||
|
@ -166,7 +170,7 @@ cd seatd
|
||||||
meson build -Dauto_features=disabled \
|
meson build -Dauto_features=disabled \
|
||||||
-Dseatd=enabled -Dlogind=enabled -Dserver=enabled \
|
-Dseatd=enabled -Dlogind=enabled -Dserver=enabled \
|
||||||
-Dexamples=disabled -Dman-pages=disabled
|
-Dexamples=disabled -Dman-pages=disabled
|
||||||
ninja -C build install
|
ninja ${NINJAFLAGS} -C build install
|
||||||
cd ..
|
cd ..
|
||||||
rm -rf seatd
|
rm -rf seatd
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue