From 64c11a37ebb6917c496b07ee90e0ec8681fd8aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 25 Mar 2024 17:10:11 +0100 Subject: [PATCH 1/8] install git --- CentOS-7/Dockerfile | 1 + Debian-stable/Dockerfile | 1 + Debian-testing/Dockerfile | 1 + Fedora-32/Dockerfile | 1 + Fedora-rawhide/Dockerfile | 1 + Fedora/Dockerfile | 1 + Ubuntu-GCC6/Dockerfile | 1 - Ubuntu/Dockerfile | 1 + 8 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CentOS-7/Dockerfile b/CentOS-7/Dockerfile index 2d4585f..021dbf7 100644 --- a/CentOS-7/Dockerfile +++ b/CentOS-7/Dockerfile @@ -25,6 +25,7 @@ RUN yum -y update; yum -y install \ qt6-qtsvg-devel.x86_64 \ qt6-qttools-devel.x86_64 \ tar \ + git \ zlib-devel.x86_64; yum clean all RUN curl -fSL "https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.sh" -o /usr/cmake.sh diff --git a/Debian-stable/Dockerfile b/Debian-stable/Dockerfile index 7551c51..8f73087 100644 --- a/Debian-stable/Dockerfile +++ b/Debian-stable/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y \ libtbb-dev \ cmake \ curl \ + git \ libqt6qmlworkerscript6 \ qt6-svg-dev \ qt6-base-dev \ diff --git a/Debian-testing/Dockerfile b/Debian-testing/Dockerfile index aadfa23..e5bc0bf 100644 --- a/Debian-testing/Dockerfile +++ b/Debian-testing/Dockerfile @@ -22,6 +22,7 @@ RUN apt-get clean && apt-get update && apt-get install -y \ libqt5svg5-dev \ libqt5opengl5-dev \ tar \ + git \ libtbb-dev \ zlib1g-dev \ libqt6qmlworkerscript6 \ diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index 843f459..9fddd6d 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -31,6 +31,7 @@ RUN dnf -y install \ tar \ tbb-devel.i686 \ diffutils \ + git \ zlib-devel.i686 && dnf clean all RUN ln -s /usr/lib64/qt5/bin/qhelpgenerator /usr/lib/qt5/bin/qhelpgenerator diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index e860ff5..18d5add 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -23,6 +23,7 @@ RUN dnf -y upgrade && \ zlib-ng-devel.x86_64 \ diffutils \ wget \ + git \ tar && \ dnf clean all && \ wget https://registrationcenter-download.intel.com/akdlm/irc_nas/19143/l_tbb_oneapi_p_2021.8.0.25334_offline.sh && \ diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile index 53f5de2..200ae55 100644 --- a/Fedora/Dockerfile +++ b/Fedora/Dockerfile @@ -32,6 +32,7 @@ RUN dnf -y install \ tbb-devel \ zlib-devel.x86_64 \ diffutils.x86_64 \ + git \ libssh-devel RUN wget "https://github.com/CGAL/LAStools/archive/LAStools-2020-11-09.zip" -O laslib.zip \ diff --git a/Ubuntu-GCC6/Dockerfile b/Ubuntu-GCC6/Dockerfile index 7528c73..2d76832 100644 --- a/Ubuntu-GCC6/Dockerfile +++ b/Ubuntu-GCC6/Dockerfile @@ -4,7 +4,6 @@ ENV DOCKERFILE_URL=$dockerfile_url RUN apt-get update && apt-get install -y \ build-essential \ - git \ liblapack-dev \ libopenblas-dev \ openmpi-bin \ diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index a41ec64..50a91a8 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -7,6 +7,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libopencv-dev \ libsuitesparse-dev \ tar \ + git \ libboost-all-dev libgmp10-dev \ libmpfr-dev zlib1g-dev \ libeigen3-dev libipe-dev \ From ea2b1ea9b95bef6938edde3960d68567e6794b0a Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 27 Mar 2024 21:51:03 +0100 Subject: [PATCH 2/8] docker push on workflow manual dispatch --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fa255bb..0a3676b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ jobs: - name: Push images run: | - if ${{ github.event_name == 'push' || github.event_name == 'schedule' }} && ${{ github.ref == 'refs/heads/master' }}; then + if ${{ github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'}} && ${{ github.ref == 'refs/heads/master' }}; then docker login -u maxgimeno -p ${{ secrets.PASSWD }} bash -x ./push.sh ${{ matrix.test_platform }} else From 4ccd8febdd220dcb6ff3f5cf6e8afa488b9895ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 28 Mar 2024 09:52:23 +0100 Subject: [PATCH 3/8] add nlohmann-json --- ArchLinux/Dockerfile | 1 + Debian-stable/Dockerfile | 3 ++- Debian-testing/Dockerfile | 3 ++- Fedora-32/Dockerfile | 1 + Fedora-rawhide/Dockerfile | 1 + Fedora/Dockerfile | 3 ++- Ubuntu/Dockerfile | 1 + 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile index 3c6cc47..5ae44cb 100644 --- a/ArchLinux/Dockerfile +++ b/ArchLinux/Dockerfile @@ -19,6 +19,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \ qt5-base qt5-script qt5-svg qt5-tools \ qt6-base qt6-tools qt6-svg qt6-websockets qt6-declarative \ intel-tbb \ + nlohmann-json \ && pacman -S --needed --noconfirm --asdeps \ freetype2 lua poppler python3 zlib \ tcsh \ diff --git a/Debian-stable/Dockerfile b/Debian-stable/Dockerfile index 8f73087..5a214b5 100644 --- a/Debian-stable/Dockerfile +++ b/Debian-stable/Dockerfile @@ -29,7 +29,8 @@ RUN apt-get update && apt-get install -y \ qt6-websockets-dev \ qt6-networkauth-dev \ libqt6chartsqml6 \ - qt6-declarative-dev + qt6-declarative-dev \ + nlohmann-json3-dev ENV CGAL_TEST_PLATFORM="Debian-Stable" diff --git a/Debian-testing/Dockerfile b/Debian-testing/Dockerfile index e5bc0bf..9bf63c6 100644 --- a/Debian-testing/Dockerfile +++ b/Debian-testing/Dockerfile @@ -34,7 +34,8 @@ RUN apt-get clean && apt-get update && apt-get install -y \ qt6-websockets-dev \ qt6-networkauth-dev \ libqt6chartsqml6 \ - qt6-declarative-dev + qt6-declarative-dev \ + nlohmann-json3-dev ENV CGAL_TEST_PLATFORM="Debian-Testing" diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index 9fddd6d..9d7a86b 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -32,6 +32,7 @@ RUN dnf -y install \ tbb-devel.i686 \ diffutils \ git \ + json-devel \ zlib-devel.i686 && dnf clean all RUN ln -s /usr/lib64/qt5/bin/qhelpgenerator /usr/lib/qt5/bin/qhelpgenerator diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 18d5add..d32b3f8 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -24,6 +24,7 @@ RUN dnf -y upgrade && \ diffutils \ wget \ git \ + json-devel \ tar && \ dnf clean all && \ wget https://registrationcenter-download.intel.com/akdlm/irc_nas/19143/l_tbb_oneapi_p_2021.8.0.25334_offline.sh && \ diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile index 200ae55..ac48813 100644 --- a/Fedora/Dockerfile +++ b/Fedora/Dockerfile @@ -33,7 +33,8 @@ RUN dnf -y install \ zlib-devel.x86_64 \ diffutils.x86_64 \ git \ - libssh-devel + libssh-devel \ + json-devel RUN wget "https://github.com/CGAL/LAStools/archive/LAStools-2020-11-09.zip" -O laslib.zip \ && unzip laslib.zip \ diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index 50a91a8..97a89db 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -13,6 +13,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libeigen3-dev libipe-dev \ libmpfi-dev \ libinsighttoolkit4-dev libtbb-dev git \ + nlohmann-json3-dev \ libyaml-cpp-dev # cgal.gf.com kernel does not seem compatible with qt6 From 7e7228c801a571e1a89525b0a9a27009c20a564b Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 30 Apr 2024 09:51:23 +0200 Subject: [PATCH 4/8] fixes after releases of Fedora 40 and Ubuntu 2024.04 --- Fedora-32/Dockerfile | 2 +- Fedora/Dockerfile | 2 +- Ubuntu/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index 9d7a86b..94b5f65 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -33,7 +33,7 @@ RUN dnf -y install \ diffutils \ git \ json-devel \ - zlib-devel.i686 && dnf clean all + zlib-ng-devel.i686 && dnf clean all RUN ln -s /usr/lib64/qt5/bin/qhelpgenerator /usr/lib/qt5/bin/qhelpgenerator RUN ln -s /usr/lib64/qt6/libexec/qhelpgenerator /usr/lib/qt6/libexec/qhelpgenerator diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile index ac48813..c2d3fb5 100644 --- a/Fedora/Dockerfile +++ b/Fedora/Dockerfile @@ -30,7 +30,7 @@ RUN dnf -y install \ unzip \ wget \ tbb-devel \ - zlib-devel.x86_64 \ + zlib-ng-devel.x86_64 \ diffutils.x86_64 \ git \ libssh-devel \ diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index 97a89db..9882274 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libmpfr-dev zlib1g-dev \ libeigen3-dev libipe-dev \ libmpfi-dev \ - libinsighttoolkit4-dev libtbb-dev git \ + libinsighttoolkit5-dev libtbb-dev git \ nlohmann-json3-dev \ libyaml-cpp-dev From 5d5f53553f1144e4d90bb5030c18745fd4676daf Mon Sep 17 00:00:00 2001 From: Nicolas Saillant Date: Mon, 6 May 2024 12:12:44 +0200 Subject: [PATCH 5/8] Add lsb-release package to Dockerfiles --- ArchLinux/Dockerfile | 1 + Debian-stable/Dockerfile | 1 + Debian-testing/Dockerfile | 1 + Fedora-32/Dockerfile | 1 + Fedora-rawhide/Dockerfile | 1 + Fedora/Dockerfile | 1 + Ubuntu/Dockerfile | 1 + 7 files changed, 7 insertions(+) diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile index 5ae44cb..1c8d2f9 100644 --- a/ArchLinux/Dockerfile +++ b/ArchLinux/Dockerfile @@ -12,6 +12,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \ base-devel \ coreutils \ git \ + lsb-release \ boost \ eigen \ glew glu mesa \ diff --git a/Debian-stable/Dockerfile b/Debian-stable/Dockerfile index 5a214b5..dc01d52 100644 --- a/Debian-stable/Dockerfile +++ b/Debian-stable/Dockerfile @@ -30,6 +30,7 @@ RUN apt-get update && apt-get install -y \ qt6-networkauth-dev \ libqt6chartsqml6 \ qt6-declarative-dev \ + lsb-release \ nlohmann-json3-dev diff --git a/Debian-testing/Dockerfile b/Debian-testing/Dockerfile index 9bf63c6..3bc6561 100644 --- a/Debian-testing/Dockerfile +++ b/Debian-testing/Dockerfile @@ -35,6 +35,7 @@ RUN apt-get clean && apt-get update && apt-get install -y \ qt6-networkauth-dev \ libqt6chartsqml6 \ qt6-declarative-dev \ + lsb-release \ nlohmann-json3-dev diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index 9d7a86b..ee703cb 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -32,6 +32,7 @@ RUN dnf -y install \ tbb-devel.i686 \ diffutils \ git \ + lsb-release \ json-devel \ zlib-devel.i686 && dnf clean all diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index d32b3f8..87b982c 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -24,6 +24,7 @@ RUN dnf -y upgrade && \ diffutils \ wget \ git \ + lsb-release \ json-devel \ tar && \ dnf clean all && \ diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile index ac48813..b67f3a8 100644 --- a/Fedora/Dockerfile +++ b/Fedora/Dockerfile @@ -34,6 +34,7 @@ RUN dnf -y install \ diffutils.x86_64 \ git \ libssh-devel \ + lsb-release \ json-devel RUN wget "https://github.com/CGAL/LAStools/archive/LAStools-2020-11-09.zip" -O laslib.zip \ diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index 97a89db..21f4bde 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libmpfi-dev \ libinsighttoolkit4-dev libtbb-dev git \ nlohmann-json3-dev \ + lsb-release \ libyaml-cpp-dev # cgal.gf.com kernel does not seem compatible with qt6 From 23893e14beb50d5c2f947c487396974cdd6fcba2 Mon Sep 17 00:00:00 2001 From: Nicolas Saillant Date: Mon, 6 May 2024 15:21:12 +0200 Subject: [PATCH 6/8] Add operating system info to test results file --- run-testsuite.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/run-testsuite.sh b/run-testsuite.sh index c8b5977..7913185 100755 --- a/run-testsuite.sh +++ b/run-testsuite.sh @@ -120,6 +120,7 @@ echo "TESTER ${CGAL_TESTER}" >> "$RESULT_FILE" echo "TESTER_NAME ${CGAL_TESTER_NAME}" >> "$RESULT_FILE" echo "TESTER_ADDRESS ${CGAL_TESTER_ADDRESS}" >> "$RESULT_FILE" echo "CGAL_TEST_PLATFORM ${PLATFORM}" >> "$RESULT_FILE" +grep -e "^-- Operating system: " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE grep -e "^-- USING " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE #Use sed to get the content of DEBUG or RELEASE CXX FLAGS so that Multiconfiguration platforms do provide their CXXXFLAGS to the testsuite page (that greps USING CXXFLAGS to get info) sed -i -E 's/(^-- USING )(DEBUG|RELEASE) (CXXFLAGS)/\1\3/' $RESULT_FILE From 791c63acb0bca7b34f598bcf8f77a17f0084ed11 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 23 May 2024 18:58:20 +0200 Subject: [PATCH 7/8] Remove qt4/qt5/qt6 from Fedora-32 --- Fedora-32/Dockerfile | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index 3acf199..506312c 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -20,14 +20,6 @@ RUN dnf -y install \ mesa-libGLU-devel.i686 \ mpfr-devel.i686 \ ntl-devel.i686 \ - qt-devel.i686 \ - qt5-qtbase-devel.i686 \ - qt5-qtscript-devel.i686 \ - qt5-qtsvg-devel.i686 \ - qt5-qttools-devel.i686 \ - qt6-qtbase-devel.i686 \ - qt6-qtsvg-devel.i686 \ - qt6-qttools-devel.i686 \ tar \ tbb-devel.i686 \ diffutils \ @@ -36,11 +28,6 @@ RUN dnf -y install \ json-devel \ zlib-ng-devel.i686 && dnf clean all -RUN ln -s /usr/lib64/qt5/bin/qhelpgenerator /usr/lib/qt5/bin/qhelpgenerator -RUN ln -s /usr/lib64/qt6/libexec/qhelpgenerator /usr/lib/qt6/libexec/qhelpgenerator -RUN ln -s /usr/lib64/qt6/libexec/qtattributionsscanner /usr/lib/qt6/libexec/qtattributionsscanner -RUN ln -s /usr/lib64/qt6/bin/qdoc /usr/lib/qt6/bin/qdoc - ENV CC="gcc -m32" CXX="g++ -m32" ENV CGAL_TEST_PLATFORM="Fedora-32" ENV CGAL_CMAKE_FLAGS="('-DCGAL_HEADER_ONLY:BOOL=TRUE')" From 40ef3a74594efba9e60365803a413692690a9ce8 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 30 May 2024 16:54:53 +0200 Subject: [PATCH 8/8] do not test libpointmatcher `master`, but 1.3.1 --- Ubuntu/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index 9a356f5..eca3e9e 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -46,6 +46,7 @@ RUN git clone https://github.com/ethz-asl/libnabo.git \ RUN git clone https://github.com/ethz-asl/libpointmatcher.git \ && cd libpointmatcher \ + && git switch -d e9a832d \ && sed -i 's/Boost_USE_STATIC_LIBS ON/Boost_USE_STATIC_LIBS OFF/' CMakeLists.txt \ && SRC_DIR=`pwd` \ && BUILD_DIR=${SRC_DIR}/build \ @@ -53,6 +54,7 @@ RUN git clone https://github.com/ethz-asl/libpointmatcher.git \ && cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DPOINTMATCHER_BUILD_EXAMPLES=OFF -DPOINTMATCHER_BUILD_EVALUATIONS=OFF ${SRC_DIR} \ && make -j"$(nproc)" && make install \ && cd ../.. && rm -rf libpointmatcher + # Commit e9a832d is 1.3.1-178-ge9a832d RUN git clone --recursive https://github.com/oxfordcontrol/osqp \ && cd ./osqp \