diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-28 20:25:21 +0200 |
|---|---|---|
| committer | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-30 10:27:40 +0200 |
| commit | f538ef64614d1e4cc86c96f42b298876152b1645 (patch) | |
| tree | c26190bf28b7324ff2a353b2ef188d94bd5d6ff9 | |
| parent | 538c0724f70f1e90ff0c92eaca7ae3ec931737c9 (diff) | |
gitlab CI: FTBS: fix pkg-config path
The pkg-config path isn't correct, so it finds an older version of xorgproto
that's already present in the base image, instead of the newer one we've
just built ourselves.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/15>
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9389b00..6fbaf18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,6 +91,7 @@ build: - .fdo.distribution-image@freebsd variables: XSERVER_MESON_FLAGS: -Dglx=false -Dglamor=false -Dudev=false -Dudev_kms=false + PKGCONF_PATH: /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/local/libdata/pkgconfig script: # start the VM. This also sets up ssh/scp to connect to "vm" # correctly. @@ -111,7 +112,7 @@ build: - | /app/vmctl exec "git clone --depth=1 https://gitlab.freedesktop.org/xorg/xserver.git" /app/vmctl exec "mkdir xserver/_builddir" - /app/vmctl exec "cd xserver/_builddir && env PKG_CONFIG_PATH=/usr/local/lib/pkgconfig meson setup $XSERVER_MESON_FLAGS" + /app/vmctl exec "cd xserver/_builddir && env PKG_CONFIG_PATH=$PKGCONF_PATH meson setup $XSERVER_MESON_FLAGS" /app/vmctl exec "cd xserver/_builddir && ninja" /app/vmctl exec "cd xserver/_builddir && ninja install" # Now build this driver @@ -120,7 +121,7 @@ build: /app/vmctl exec "cd $CI_PROJECT_NAME/_builddir && ../autogen.sh --disable-silent-rules PKG_CONFIG_PATH=/usr/local/lib/pkgconfig" /app/vmctl exec "cd $CI_PROJECT_NAME/_builddir && make" /app/vmctl exec "cd $CI_PROJECT_NAME/_builddir && make check" - /app/vmctl exec "cd $CI_PROJECT_NAME/_builddir && env PKG_CONFIG_PATH=/usr/local/lib/pkgconfig make distcheck" && touch .success + /app/vmctl exec "cd $CI_PROJECT_NAME/_builddir && env PKG_CONFIG_PATH=$PKGCONF_PATH make distcheck" && touch .success # copy any test results from the VM to our container so we can # save them as artifacts # - scp -r vm:$CI_PROJECT_NAME/test-results.xml . |