ci: Update the tool chain to use gcc 9 and clang 8

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Reviewed-by: Jakob Bornecrantz <jakob@collabora.com>
macos/master
Gert Wollny 5 years ago
parent fc3f1089e9
commit 71747ea999
  1. 14
      ci/Dockerfile

@ -6,8 +6,8 @@ ENV PATH=$PATH:/usr/local/go/bin
ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib:/usr/local/lib/x86_64-linux-gnu ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib:/usr/local/lib/x86_64-linux-gnu
ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/local/lib/x86_64-linux-gnu/pkgconfig ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/local/lib/x86_64-linux-gnu/pkgconfig
ENV LDFLAGS="-L/usr/local/lib64 -L/usr/local/lib/ -L/usr/local/lib/x86_64-linux-gnu" ENV LDFLAGS="-L/usr/local/lib64 -L/usr/local/lib/ -L/usr/local/lib/x86_64-linux-gnu"
ENV CC="gcc-7" ENV CC="gcc-9"
ENV CXX="g++-7" ENV CXX="g++-9"
ENV CFLAGS="-g3" ENV CFLAGS="-g3"
ENV CXXFLAGS="-g3" ENV CXXFLAGS="-g3"
ENV GIT_DATE="`date +%Y-%m-%d -d \"15 months ago\"`" ENV GIT_DATE="`date +%Y-%m-%d -d \"15 months ago\"`"
@ -28,14 +28,14 @@ RUN apt-get update && \
busybox \ busybox \
ccache \ ccache \
check \ check \
clang-6.0 \ clang-8 \
cmake \ cmake \
dbus \ dbus \
libepoxy-dev \ libepoxy-dev \
g++-7 \ g++-9 \
gcc-7 \ gcc-9 \
gdb \ gdb \
gdc \ gdc-9 \
git \ git \
golang-go \ golang-go \
kbd \ kbd \
@ -49,7 +49,7 @@ RUN apt-get update && \
libwayland-dev \ libwayland-dev \
libwayland-egl-backend-dev \ libwayland-egl-backend-dev \
linux-image-amd64 \ linux-image-amd64 \
lld-6.0 \ lld-8 \
mesa-utils \ mesa-utils \
nasm \ nasm \
ninja-build \ ninja-build \

Loading…
Cancel
Save