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

ci: Use fixed Git commits for piglit, rendercheck & xts 

Without this, building a new docker image may pull in new changes from
those repositories, which may affect the CI results.
This commit is contained in:
Michel Dänzer 2022-09-02 12:36:25 +02:00 committed by Michel Dänzer
parent c637ca66ec
commit 3d7df9b452
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -19,7 +19,7 @@ variables:
FDO_UPSTREAM_REPO: xorg/xserver FDO_UPSTREAM_REPO: xorg/xserver
FDO_DISTRIBUTION_VERSION: bullseye-slim FDO_DISTRIBUTION_VERSION: bullseye-slim
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} 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: "2022-09-02-weston" FDO_DISTRIBUTION_TAG: "2022-09-02-fixed-commits"
include: include:
- project: 'freedesktop/ci-templates' - project: 'freedesktop/ci-templates'

11
.gitlab-ci/debian-install.sh
View File

@ -145,18 +145,23 @@ ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
cd .. cd ..
rm -rf libdecor rm -rf libdecor
git clone https://gitlab.freedesktop.org/mesa/piglit.git --depth 1 git clone https://gitlab.freedesktop.org/mesa/piglit.git
cd piglit
git checkout 265896c86f90cb72e8f218ba6a3617fca8b9a1e3
cd ..
git clone https://gitlab.freedesktop.org/xorg/test/xts --depth 1 git clone https://gitlab.freedesktop.org/xorg/test/xts
cd xts cd xts
git checkout dbbfa96c036e596346147081cbceda136e7c86c1
# Using -fcommon until we get a proper fix into xtst. # Using -fcommon until we get a proper fix into xtst.
# See discussion at https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/913 # See discussion at https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/913
CFLAGS=-fcommon ./autogen.sh CFLAGS=-fcommon ./autogen.sh
xvfb-run make -j${FDO_CI_CONCURRENT:-4} xvfb-run make -j${FDO_CI_CONCURRENT:-4}
cd .. cd ..
git clone https://gitlab.freedesktop.org/xorg/test/rendercheck --depth 1 git clone https://gitlab.freedesktop.org/xorg/test/rendercheck
cd rendercheck cd rendercheck
git checkout 67a820621b1475ebfcf3d4f9d7f03a5fc3b9769a
meson build meson build
ninja -j${FDO_CI_CONCURRENT:-4} -C build install ninja -j${FDO_CI_CONCURRENT:-4} -C build install
cd .. cd ..