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

ci: Reuse xserver created by meson-dist job in driver build jobs 

Currently each driver build job also builds the server. This is bad use
of resources because server build takes way more resources compared to a
driver build. Reusing already built xserver would resolve the issue.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1806>
This commit is contained in:
Povilas Kanapickas 2025-02-28 15:52:35 +02:00 committed by Marge Bot
parent 8e5a5cf2c1
commit 68054d0fe3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@ -273,8 +273,9 @@ xf86-driver-build-test:
- REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware
SHA: xf86-video-vmware-13.4.0 SHA: xf86-video-vmware-13.4.0
script: script:
# Install the server first # built xserver is taken from meson-dist job
- .gitlab-ci/meson-build.sh --skip-test --run-install - export PKG_CONFIG_PATH=$(pwd)/xserver-tarball/install/lib/x86_64-linux-gnu/pkgconfig
- export ACLOCAL_PATH=$(pwd)/xserver-tarball/install/share/aclocal/
- unset MESON_EXTRA_ARGS - unset MESON_EXTRA_ARGS
- DRIVER=$(basename $REPO) - DRIVER=$(basename $REPO)
- git clone "$REPO" "$DRIVER" - git clone "$REPO" "$DRIVER"
@ -287,7 +288,9 @@ xf86-driver-build-test:
./autogen.sh && make ./autogen.sh && make
fi fi
needs: needs:
- "meson" - meson-dist
dependencies:
- meson-dist
variables: variables:
GIT_DEPTH: 1 GIT_DEPTH: 1
MESON_ARGS: -Dprefix=/usr/ MESON_ARGS: -Dprefix=/usr/