From 93f48e6465d322adce4dfd2d81fd78b9109f2abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20de=20Chalendar?= Date: Mon, 29 Apr 2024 23:57:20 +0200 Subject: [PATCH] Correct qml modules installation in Ubuntu22.04 --- continuous_integration/Dockerfile-ubuntu22.04 | 4 +++- continuous_integration/Dockerfile-ubuntu22.04-fia | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/continuous_integration/Dockerfile-ubuntu22.04 b/continuous_integration/Dockerfile-ubuntu22.04 index dacc6cfd3..e51761ffc 100644 --- a/continuous_integration/Dockerfile-ubuntu22.04 +++ b/continuous_integration/Dockerfile-ubuntu22.04 @@ -4,7 +4,9 @@ ARG PACKAGES="yes" ARG COMPILER="clang" ENV DEBIAN_FRONTEND=noninteractive -RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update && apt-get install -y -qq locales unzip bash coreutils apt-utils lsb-release git gcc g++ build-essential make cmake cmake-data curl python3-nltk gawk wget python3 python3-pip ninja-build qt6-base-dev qt6-base-dev-tools libqt6concurrent6 libtre-dev libboost-all-dev nodejs npm libicu-dev libeigen3-dev dos2unix python-is-python3 nvidia-cuda-toolkit nvidia-cudnn +RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update && apt-get install -y -qq locales unzip bash coreutils apt-utils lsb-release git gcc g++ build-essential make cmake cmake-data curl python3-nltk gawk wget python3 python3-pip ninja-build qt6-base-dev qt6-base-dev-tools libqt6concurrent6 qml6-module-qtqml qt6-tools-dev libqt6concurrent6 qt6-base-dev-tools qt6-charts-dev qt6-declarative-dev qt6-declarative-dev-tools qt6-httpserver-dev qt6-multimedia-dev libtre-dev libboost-all-dev nodejs npm libicu-dev libeigen3-dev dos2unix python-is-python3 nvidia-cuda-toolkit nvidia-cudnn + + # Use clang or gcc RUN bash -c 'if [[ "$COMPILER" == "clang" ]] ; then apt-get install -y -qq llvm clang clang-tidy clang-tools && update-alternatives --set cc /usr/bin/clang && update-alternatives --set c++ /usr/bin/clang++ ; else apt-get install -y -qq gcc g++ -qq ; fi' diff --git a/continuous_integration/Dockerfile-ubuntu22.04-fia b/continuous_integration/Dockerfile-ubuntu22.04-fia index f7cf33975..ca75c154c 100644 --- a/continuous_integration/Dockerfile-ubuntu22.04-fia +++ b/continuous_integration/Dockerfile-ubuntu22.04-fia @@ -4,7 +4,7 @@ ARG PACKAGES="yes" ARG COMPILER="clang" ENV DEBIAN_FRONTEND=noninteractive -RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update && apt-get install -y -qq locales unzip bash coreutils apt-utils lsb-release git gcc g++ build-essential make cmake cmake-data curl python3-nltk gawk wget python3 python3-pip ninja-build qt6-base-dev qt6-base-dev-tools libqt6concurrent6 libtre-dev libboost-all-dev nodejs npm libicu-dev libeigen3-dev dos2unix python-is-python3 nvidia-cuda-toolkit nvidia-cudnn +RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update && apt-get install -y -qq locales unzip bash coreutils apt-utils lsb-release git gcc g++ build-essential make cmake cmake-data curl python3-nltk gawk wget python3 python3-pip ninja-build qt6-base-dev qt6-base-dev-tools libqt6concurrent6 qml6-module-qtqml qt6-tools-dev libqt6concurrent6 qt6-base-dev-tools qt6-charts-dev qt6-declarative-dev qt6-declarative-dev-tools qt6-httpserver-dev qt6-multimedia-dev libtre-dev libboost-all-dev nodejs npm libicu-dev libeigen3-dev dos2unix python-is-python3 nvidia-cuda-toolkit nvidia-cudnn # Use clang or gcc RUN bash -c 'if [[ "$COMPILER" == "clang" ]] ; then apt-get install -y -qq llvm clang clang-tidy clang-tools && update-alternatives --set cc /usr/bin/clang && update-alternatives --set c++ /usr/bin/clang++ ; else apt-get install -y -qq gcc g++ -qq ; fi'