Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex Goins
xserver
Commits
537f06e2
Commit
537f06e2
authored
Feb 19, 2019
by
Michel Dänzer
Committed by
Michel Dänzer
Feb 19, 2019
Browse files
gitlab-ci: Add ccache to docker image, and leave in autotools
We're going to make use of these in build & test jobs.
parent
f6753c11
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
537f06e2
...
...
@@ -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-201
81
21
7
"
IMAGE_TAG
:
"
debian-testing-201
90
21
9
"
IMAGE_LOCAL
:
"
$CI_REGISTRY_IMAGE:$IMAGE_TAG"
IMAGE_MAIN
:
"
registry.freedesktop.org/xorg/xserver:$IMAGE_TAG"
...
...
.gitlab-ci/Dockerfile
View file @
537f06e2
...
...
@@ -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_
*
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment