Age | Commit message (Collapse) | Author | Files | Lines |
|
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
The latter is what ci-templates expect.
Fixes: ab73c16930d6 "ci: Update to the latest templates"
Reviewed-by: Simon Ser <contact@emersion.fr>
|
|
This is required for the support of upcoming XI 2.4 protocol.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
|
|
Only cross-build for x86 MinGW-w64, as x64 MinGW-w64 will probably
require fixing LLP64 issues.
I don't know any source for pre-built cross-dependencies of the X
server, so build these from git.
Don't build with GLX enabled, so I don't have to deal with
cross-building mesa and it's dependencies, for the moment.
|
|
While this isn't critical yet, it might become so at some point, so
let's make sure it keeps working.
Don't set the PIGLIT/XTEST_DIR variables for ninja dist, testing XTS
once against each DDX is enough (as part of ninja test).
Requires git in the docker image.
v2:
* Drop /usr/local/bin/xkbcomp symlink, no longer needed with xkbcomp
1.4.1 (Peter Hutterer)
|
|
This is a requirement for testing meson dist in CI.
|
|
By its nature, testing incurs a risk of breaking something every time
we bump the image.
This requires building wayland-protocols locally, since the package in
buster is too old for current Xwayland.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
They now ensure the image is up to date in forked projects, and we no
longer need to reconstruct the image name.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
It doesn't need a full checkout of the xserver Git tree, so this can
save some time and resources.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
To take advantage of more than 4 CPU cores available to the container.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
wayland/ci-templates was moved to freedesktop/ci-templates, everything
else stayed the same so the sha is still valid.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
|
|
|
|
To prevent breakage with glamor disabled from creeping in again.
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
|
It's long and kind of redundant.
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
|
* This prevents issues from creeping back in at a later stage.
|
|
There are no warnings left, so let's prevent new ones from creeping
back in.
|
|
The shared GitLab CI runners are configured for jobs making use of up
to 4 CPU cores, attempting to use more may overload them.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
Same as done in Mesa.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
Allowing redundant pipelines to be automatically cancelled.
|
|
To match Mesa.
|
|
Primarily to fix the skopeo copy issue that causes pipelines to fail right
now, see ci-templates commit 0a9bdd33a98f05af67.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
This catches the broken manpages in the autoconf build which appeared
after commit 2e497bf887ac ("man: s/__/@/g") and were only partly
rectified by commit 0445705a8bbf ("man: Fix automake seddery").
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
|
|
The previous commit requires wayland-protocols 1.18. Bump DEBIAN_TAG to
re-generate the Debian image and get the wayland-protocols update.
Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
|
|
Up to twice, for a total of 3 attempts maximum.
This will hopefully avoid spurious CI pipeline failures due to
intermittent GitLab/docker infrastructure issues.
Inspired by
https://gitlab.freedesktop.org/mesa/mesa/commit/6140ed3d2c5409bcdb5c0879411690ef222b086c
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
Drop the verbose test log output, matching the meson job script.
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
This way, the second ninja command line will be visible again as well in
the job output.
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
I keep wanting this when reviewing people's glamor patches.
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
We need the DRI swrast driver (for GLX in vfb), and also libgl (for
libepoxy in glamor)
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
I've found that it's hard to find the original error in a dump full of
xserver debug spam for the passing cases, and when I needed to look at
this I end up using a proper editor on the file from the artifacts
view anyway.
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
Michel noted that I could do this instead of bumping the tag as I
developed, so leave that note for the next person.
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
There shouldn't be a difference for users, but this way we do manage
all of our containers from freedesktop.org
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
|
|
This reverts commit 8694395fcfd407190db74f31064960e484747377.
Some scenarios have come to light where this failed to ensure the docker
image exists:
* If the master branch of a forked repository is used for an MR which
doesn't modify .gitlab-ci.yml, the docker-image job may not run.
* If the docker-image job of the first pipeline in a forked repository
is cancelled or fails for any reason, and .gitlab-ci.yml isn't
modified for the next pipeline run.
|
|
We don't set the PIGLIT_DIR and XTS_DIR environment variables for make
distcheck for now, otherwise it complains about files left behind by
piglit.
|
|
|
|
Meson picks it up automatically.
Based on:
* https://gitlab.freedesktop.org/mesa/mesa/merge_requests/240
* https://gould.cx/ted/blog/2017/06/10/ccache-for-Gitlab-CI/
* https://stackoverflow.com/questions/53659419/ccache-no-hits-in-gitlab-ci
v2 based on the corresponding Mesa change:
* Quote CCACHE_(BASE)DIR environment variables.
* Clear ccache stats in before_script.
* Move cache stanza to the build-and-test job, the cache isn't used in
the docker-image job.
Reviewed-by: Adam Jackson <ajax@redhat.com> # v1
|
|
We're going to make use of these in build & test jobs.
|
|
The name of a forked repository can be changed later, in which case this
would fail to refer to the main repository.
Pointed out by Eric Engestrom in
https://gitlab.freedesktop.org/mesa/mesa/merge_requests/224 .
|
|
Otherwise there's normally no need to run it. It will also run when a
new branch is created, which ensures that the docker image always exists
(e.g. in a newly forked repository).
Inspired by https://gitlab.freedesktop.org/mesa/mesa/merge_requests/143
|
|
Although piglit could now handle non-ASCII characters in the
environment, meson was still failing without this (even though it's
using Python 3).
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
This removes the dependency on an externally generated docker image, and
should make it easier to update the docker image or make other changes
related to it.
This is based on Debian testing, because I'm most familiar with Debian.
But it should be easy to base it on another distro.
v2:
* Use kaniko instead of docker-in-docker for image generation, so it can
also work in unprivileged runners.
* Drop piglit.conf & tetexec.cfg overrides, just make sure the files in
the image work.
|
|
Fold build-travis-deps.sh into .gitlab-ci.yml.
Preparation for the next change, which would break the Travis Linux
build.
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
Can be useful for figuring out what caused the failure.
|
|
No idea which cult's cargo I was looking at there. Cuts about a minute
off the build time.
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
Looks quite a bit like the travis path, doesn't it? Still, nice to not
rely on an external service if we don't have to.
Signed-off-by: Adam Jackson <ajax@redhat.com>
|