ci: Use distro libepoxy

Signed-off-by: Elie Tournier <elie.tournier@collabora.com>
Reviewed-By: Gert Wollny <gert.wollny@collabora.com>
macos/master
Elie Tournier 6 years ago
parent ef72ec3c90
commit c98a7ea3b3
  1. 12
      ci/Dockerfile

@ -31,6 +31,7 @@ RUN apt-get -y install ca-certificates && \
clang-6.0 \ clang-6.0 \
cmake \ cmake \
dbus \ dbus \
libepoxy-dev \
g++-7 \ g++-7 \
gcc-7 \ gcc-7 \
gdb \ gdb \
@ -77,7 +78,6 @@ RUN apt-get -y install ca-certificates && \
RUN apt-get -y build-dep --no-install-recommends \ RUN apt-get -y build-dep --no-install-recommends \
libdrm \ libdrm \
libepoxy \
mesa \ mesa \
piglit \ piglit \
virglrenderer virglrenderer
@ -95,16 +95,6 @@ RUN go install -x github.com/tomeuv/fakemachine/cmd/fakemachine
# error: RPC failed; curl 56 GnuTLS recv error (-54): Error in the pull function. # error: RPC failed; curl 56 GnuTLS recv error (-54): Error in the pull function.
RUN git config --global http.postBuffer 1048576000 RUN git config --global http.postBuffer 1048576000
ARG KNOWN_GOOD_EPOXY=737b6918703c
WORKDIR /libepoxy
RUN git clone --shallow-since="$GIT_DATE" https://github.com/anholt/libepoxy.git . && \
git checkout ${KNOWN_GOOD_EPOXY} && \
git log --oneline -n 1 && \
./autogen.sh --prefix=/usr/local && \
make -j$(nproc) install && \
rm -rf /libepoxy
WORKDIR /
ARG KNOWN_GOOD_CTS=6c709dc9a99b70572aceb0f7698ab044383ff948 ARG KNOWN_GOOD_CTS=6c709dc9a99b70572aceb0f7698ab044383ff948
WORKDIR /VK-GL-CTS WORKDIR /VK-GL-CTS
RUN git clone --shallow-since="$GIT_DATE" https://github.com/KhronosGroup/VK-GL-CTS.git . && \ RUN git clone --shallow-since="$GIT_DATE" https://github.com/KhronosGroup/VK-GL-CTS.git . && \

Loading…
Cancel
Save