Merge branch 'master' into python3

CGAL · Jun 10, 2024 · 563d9ac · 563d9ac
2 parents fbcfe30 + f93231d
commit 563d9ac
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 21 deletions.
diff --git 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

diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile
@@ -12,13 +12,15 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
               base-devel \
               coreutils \
               git \
+              lsb-release \
               boost \
               eigen \
               glew glu mesa \
               gmp mpfr mpfi ntl \
               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/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
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y \
     libtbb-dev \
     cmake \
     curl \
+    git \
     libqt6qmlworkerscript6 \
     qt6-svg-dev \
     qt6-base-dev \
@@ -28,7 +29,9 @@ RUN apt-get update && apt-get install -y \
     qt6-websockets-dev \
     qt6-networkauth-dev \
     libqt6chartsqml6 \
-    qt6-declarative-dev
+    qt6-declarative-dev \
+    lsb-release \
+    nlohmann-json3-dev
 
 
 ENV CGAL_TEST_PLATFORM="Debian-Stable"

diff --git 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 \
@@ -33,7 +34,9 @@ RUN apt-get clean && apt-get update && apt-get install -y \
     qt6-websockets-dev \
     qt6-networkauth-dev \
     libqt6chartsqml6 \
-    qt6-declarative-dev
+    qt6-declarative-dev \
+    lsb-release \
+    nlohmann-json3-dev
 
 
 ENV CGAL_TEST_PLATFORM="Debian-Testing"

diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile
@@ -20,23 +20,13 @@ 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 \
-    zlib-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
+    git \
+    lsb-release \
+    json-devel \
+    zlib-ng-devel.i686 && dnf clean all
 
 ENV CC="gcc -m32" CXX="g++ -m32"
 ENV CGAL_TEST_PLATFORM="Fedora-32"

diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile
@@ -23,6 +23,9 @@ RUN dnf -y upgrade && \
                    zlib-ng-devel.x86_64 \
 		           diffutils \
                    wget \
+                   git \
+                   lsb-release \
+                   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
@@ -30,9 +30,12 @@ RUN dnf -y install \
     unzip \
     wget \
     tbb-devel \
-    zlib-devel.x86_64 \
+    zlib-ng-devel.x86_64 \
     diffutils.x86_64 \
-    libssh-devel
+    git \
+    libssh-devel \
+    lsb-release \
+    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-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
@@ -7,11 +7,14 @@ 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 \
     libmpfi-dev \
-    libinsighttoolkit4-dev libtbb-dev git \
+    libinsighttoolkit5-dev libtbb-dev git \
+    nlohmann-json3-dev \
+    lsb-release \
     libyaml-cpp-dev
 
 # cgal.gf.com kernel does not seem compatible with qt6
@@ -43,13 +46,15 @@ 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 \
  && mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} \
  && 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 \

diff --git 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