diff options
| author | Povilas Kanapickas <povilas@radix.lt> | 2021-09-15 20:09:33 +0300 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-09-16 11:23:53 +1000 |
| commit | 83312147716cfb4627cd9ae8e58ac5aec50e168f (patch) | |
| tree | 9521b71c272846a69548bf597859c4d6fb98db8c | |
| parent | 8588a19f63f9c17f66a83850e20955450c3098a2 (diff) | |
gitlab-ci: Configure xorgproto build from source
We need newer xorgproto than what's in fedora as we depend on inputproto
2.3.99.1 or newer.
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rwxr-xr-x | .gitlab-ci/fedora-install.sh | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5ed226..69ec08c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,8 @@ stages: variables: FDO_DISTRIBUTION_VERSION: 33 FDO_DISTRIBUTION_PACKAGES: 'git autoconf automake libtool make xorg-x11-server-devel libudev-devel libevdev-devel libinput-devel xorg-x11-util-macros' - FDO_DISTRIBUTION_TAG: '2021-04-06.0' + FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/fedora-install.sh' + FDO_DISTRIBUTION_TAG: '2021-09-15.0' fedora@container_build: diff --git a/.gitlab-ci/fedora-install.sh b/.gitlab-ci/fedora-install.sh new file mode 100755 index 0000000..1075330 --- /dev/null +++ b/.gitlab-ci/fedora-install.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# we require at least inputproto >= 2.3.99.1 which has been released in xorgproto 2021.5 +git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git --depth 1 --branch=xorgproto-2021.5 +pushd xorgproto +./autogen.sh +make -j${FDO_CI_CONCURRENT:-4} install +popd +rm -rf xorgproto |