diff options
| author | Povilas Kanapickas <povilas@radix.lt> | 2021-05-30 18:24:02 +0300 |
|---|---|---|
| committer | Povilas Kanapickas <povilas@radix.lt> | 2021-06-01 20:54:10 +0300 |
| commit | 15a7f104e65c328ca54e5c2b9f8847cd66ce1c6e (patch) | |
| tree | da26a8b34aed3f91f661561510d7a27fd9a466bb | |
| parent | 056917e10ed6ace112a1fe98cd0f74a27ad5aad0 (diff) | |
gitlab-ci: Setup to build from development libxi
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ae3b06..d6fa9db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,9 +13,9 @@ stages: - build variables: - FDO_DISTRIBUTION_TAG: '2020-12-14.0' # change this to rebuild the images + FDO_DISTRIBUTION_TAG: '2021-05-30.2' # change this to rebuild the images FDO_DISTRIBUTION_VERSION: 'stable' - FDO_DISTRIBUTION_PACKAGES: 'git ca-certificates meson g++ pkgconf libpixman-1-dev xserver-xorg-input-wacom libx11-dev libxi-dev libxext-dev libxrandr-dev libxtst-dev libxxf86dga-dev' + FDO_DISTRIBUTION_PACKAGES: 'git ca-certificates meson g++ pkgconf libpixman-1-dev xserver-xorg-input-wacom libx11-dev libxi-dev libxext-dev libxrandr-dev libxtst-dev libxxf86dga-dev libevdev-dev libevemu-dev' MESON_BUILDDIR: 'build dir' NINJA_ARGS: '' @@ -33,7 +33,7 @@ container-prep: stage: prep variables: GIT_STRATEGY: none - FDO_BASE_IMAGE: registry.freedesktop.org/xorg/xserver/debian/buster-slim:2020-11-16 + FDO_BASE_IMAGE: registry.freedesktop.org/xorg/xserver/debian/buster-slim:2021-05-17 xserver-build: extends: @@ -46,6 +46,16 @@ xserver-build: - meson -Dc_args="-fno-common" -Dprefix="$INSTDIR" $MESON_OPTIONS _build - ninja -j${FDO_CI_CONCURRENT:-4} -C _build install - popd > /dev/null + - git clone --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxi --branch=libXi-1.7.99.2 + - pushd libxi > /dev/null + - autoreconf -fi + - mkdir build + - pushd build > /dev/null + - ../configure --prefix="$INSTDIR" + - make all -j${FDO_CI_CONCURRENT:-4} + - make install -j${FDO_CI_CONCURRENT:-4} + - popd > /dev/null + - popd > /dev/null variables: MESON_OPTIONS: '-Dxwayland=false -Dxephyr=false -Dxvfb=false -Ddmx=false' artifacts: |