From b7a335916c9e4d9ad48b41bbde22b371b977f078 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 3 Nov 2019 23:27:14 +0100 Subject: [PATCH] Enable clazy on travis --- .docker/qgis.dockerfile | 2 +- .docker/qgis3-build-deps.dockerfile | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.docker/qgis.dockerfile b/.docker/qgis.dockerfile index e71f6b6aebb..f7f42322cb9 100644 --- a/.docker/qgis.dockerfile +++ b/.docker/qgis.dockerfile @@ -12,7 +12,7 @@ LABEL Description="Docker container with QGIS" Vendor="QGIS.org" Version="1.1" ARG BUILD_TIMEOUT=360000 ARG CC=/usr/lib/ccache/clang -ARG CXX=/usr/lib/ccache/clang++ +ARG CXX=/usr/lib/ccache/clazy ENV LANG=C.UTF-8 COPY . /QGIS diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile index b3ced020b83..db6e3c819d6 100644 --- a/.docker/qgis3-build-deps.dockerfile +++ b/.docker/qgis3-build-deps.dockerfile @@ -146,6 +146,15 @@ RUN echo "alias python=python3" >> ~/.bash_aliases RUN curl -k https://www.orfeo-toolbox.org/packages/OTB-7.0.0-Linux64.run -o /tmp/OTB-Linux64.run && sh /tmp/OTB-Linux64.run --target /opt/otb ENV OTB_INSTALL_DIR=/opt/otb +# Clazy +RUN curl -k https://downloads.kdab.com/clazy/1.6/Clazy-x86_64-1.6.AppImage -o /tmp/Clazy.AppImage \ + && chmod +x /tmp/Clazy.AppImage \ + && mkdir /opt/clazy \ + && cd /opt/clazy \ + && /tmp/Clazy.AppImage --appimage-extract \ + && ln -s /opt/clazy/squashfs-root/AppRun /bin/clazy \ + && ln -s /bin/clazy /usr/lib/ccache/clazy + ENV QT_SELECT=5 ENV LANG=C.UTF-8 ENV PATH="/usr/local/bin:${PATH}"