xserver: Branch 'master' - 3 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Feb 20 17:48:04 UTC 2019
.gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++--
.gitlab-ci/Dockerfile | 4 ++--
2 files changed, 34 insertions(+), 4 deletions(-)
New commits:
commit 2f12c8017508f23195db92503435fc3ef183da4b
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Tue Feb 19 18:37:53 2019 +0100
gitlab-ci: Add autotools build & test job
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 984a93854..3e9df00d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ debian-testing:
set -e
- /kaniko/executor --context $CI_PROJECT_DIR/.gitlab-ci --destination $IMAGE_LOCAL
-build-and-test:
+.common-build-and-test:
stage: build-and-test
image: $IMAGE_LOCAL
artifacts:
@@ -70,8 +70,29 @@ build-and-test:
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
+ - export PATH="/usr/lib/ccache:$PATH"
- ccache --zero-stats
- ccache --show-stats
+ after_script:
+ - CCACHE_DIR="$PWD/ccache" ccache --show-stats
+
+autotools-build-and-test:
+ extends: .common-build-and-test
+ script:
+ - mkdir build/
+ - cd build/
+ - |
+ ../autogen.sh --prefix=/usr
+ make -j$(nproc) install
+ set +e
+ set -x
+ make -j$(nproc) check
+ status=$?
+ cat test/piglit-results/xvfb/long-summary || :
+ exit $status
+
+meson-build-and-test:
+ extends: .common-build-and-test
script:
- meson -Dprefix=/usr build/
- |
@@ -83,5 +104,3 @@ build-and-test:
cat build/meson-logs/testlog.txt
cat build/test/piglit-results/xvfb/long-summary || :
exit $status
- after_script:
- - CCACHE_DIR="$PWD/ccache" ccache --show-stats
commit b577df77451d34e28cfef3bda5031a43caeba90a
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Thu Feb 14 17:39:24 2019 +0100
gitlab-ci: Use ccache
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 at redhat.com> # v1
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61291371f..984a93854 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,10 +59,19 @@ build-and-test:
when: on_failure
paths:
- build/test/piglit-results/
+ cache:
+ paths:
+ - ccache/
variables:
LC_ALL: C.UTF-8
PIGLIT_DIR: /root/piglit
XTEST_DIR: /root/xts
+ before_script:
+ - export CCACHE_BASEDIR="$PWD"
+ - export CCACHE_DIR="$PWD/ccache"
+ - export CCACHE_COMPILERCHECK=content
+ - ccache --zero-stats
+ - ccache --show-stats
script:
- meson -Dprefix=/usr build/
- |
@@ -74,3 +83,5 @@ build-and-test:
cat build/meson-logs/testlog.txt
cat build/test/piglit-results/xvfb/long-summary || :
exit $status
+ after_script:
+ - CCACHE_DIR="$PWD/ccache" ccache --show-stats
commit 537f06e21ee2c4c88ee062c26555338257e043ef
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Tue Feb 19 18:16:16 2019 +0100
gitlab-ci: Add ccache to docker image, and leave in autotools
We're going to make use of these in build & test jobs.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c9e09920..61291371f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@
# container registry, so that the image from the main repository's registry
# will be used there as well.
variables:
- IMAGE_TAG: "debian-testing-20181217"
+ IMAGE_TAG: "debian-testing-20190219"
IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
IMAGE_MAIN: "registry.freedesktop.org/xorg/xserver:$IMAGE_TAG"
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index eee6c5b6d..4c66ad0d4 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -12,7 +12,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
chmod +x /usr/sbin/policy-rc.d && \
echo 'deb-src https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/deb-src.list && \
apt-get update && \
- apt-get install -y meson git ca-certificates cmake automake autoconf libtool libwaffle-dev \
+ apt-get install -y meson git ca-certificates ccache cmake automake autoconf libtool libwaffle-dev \
libxkbcommon-dev python3-mako python3-numpy python3-six x11-utils x11-xserver-utils xauth xvfb && \
apt-get build-dep -y xorg-server && \
\
@@ -29,7 +29,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
echo '[xts]' > piglit/piglit.conf && echo 'path=/root/xts' >> piglit/piglit.conf && \
find -name \*.a -o -name \*.o | xargs rm && \
\
- apt-get purge -y git cmake automake autoconf libtool libwaffle-dev libxkbcommon-dev \
+ apt-get purge -y git cmake libwaffle-dev libxkbcommon-dev \
x11-utils x11-xserver-utils xauth xvfb && \
apt-get autoremove -y --purge && apt-get clean && \
rm -f /var/lib/apt/lists/deb.debian.org_debian_dists_testing_*
More information about the xorg-commit
mailing list