From 71b0e87aa2b093d6c52dcd67071e3ee7751e797d Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 10 Oct 2024 10:58:02 +0200 Subject: [PATCH 1/5] remove centos --- CentOS-7-ICC-2016-Release/Dockerfile | 8 ----- CentOS-7-ICC-2016-Release/init.cmake | 4 --- CentOS-7-ICC-2016/Dockerfile | 26 ---------------- CentOS-7-ICC-2016/init.cmake | 9 ------ CentOS-7-ICC-Release/Dockerfile | 8 ----- CentOS-7-ICC-Release/init.cmake | 4 --- CentOS-7-ICC-beta/Dockerfile | 37 ---------------------- CentOS-7-ICC-beta/config.cfg | 20 ------------ CentOS-7-ICC-beta/init.cmake | 4 --- CentOS-7-ICC-beta/intel.sh | 4 --- CentOS-7-ICC/Dockerfile | 29 ------------------ CentOS-7-ICC/config.cfg | 9 ------ CentOS-7-ICC/init.cmake | 4 --- CentOS-7-ICC/intel.sh | 4 --- CentOS-7-Release/Dockerfile | 8 ----- CentOS-7-Release/init.cmake | 4 --- CentOS-7/Dockerfile | 46 ---------------------------- CentOS-7/init.cmake | 9 ------ push.sh | 20 ------------ test.sh | 30 ------------------ 20 files changed, 287 deletions(-) delete mode 100644 CentOS-7-ICC-2016-Release/Dockerfile delete mode 100644 CentOS-7-ICC-2016-Release/init.cmake delete mode 100644 CentOS-7-ICC-2016/Dockerfile delete mode 100644 CentOS-7-ICC-2016/init.cmake delete mode 100644 CentOS-7-ICC-Release/Dockerfile delete mode 100644 CentOS-7-ICC-Release/init.cmake delete mode 100644 CentOS-7-ICC-beta/Dockerfile delete mode 100755 CentOS-7-ICC-beta/config.cfg delete mode 100644 CentOS-7-ICC-beta/init.cmake delete mode 100644 CentOS-7-ICC-beta/intel.sh delete mode 100644 CentOS-7-ICC/Dockerfile delete mode 100644 CentOS-7-ICC/config.cfg delete mode 100644 CentOS-7-ICC/init.cmake delete mode 100644 CentOS-7-ICC/intel.sh delete mode 100644 CentOS-7-Release/Dockerfile delete mode 100644 CentOS-7-Release/init.cmake delete mode 100644 CentOS-7/Dockerfile delete mode 100644 CentOS-7/init.cmake diff --git a/CentOS-7-ICC-2016-Release/Dockerfile b/CentOS-7-ICC-2016-Release/Dockerfile deleted file mode 100644 index d37c4ad..0000000 --- a/CentOS-7-ICC-2016-Release/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM cgal/testsuite-docker:centos7-icc-2016 -ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url - -ENV CGAL_TEST_PLATFORM="CentOS7-ICC-2016-Release" -ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-w1 -O3 -DCGAL_NDEBUG')" -ENV INIT_FILE=/tmp/init.cmake -COPY init.cmake /tmp/init.cmake diff --git a/CentOS-7-ICC-2016-Release/init.cmake b/CentOS-7-ICC-2016-Release/init.cmake deleted file mode 100644 index 4fefad8..0000000 --- a/CentOS-7-ICC-2016-Release/init.cmake +++ /dev/null @@ -1,4 +0,0 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_RELEASE "-DCGAL_NDEBUG -O3" CACHE STRING "") -SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "") diff --git a/CentOS-7-ICC-2016/Dockerfile b/CentOS-7-ICC-2016/Dockerfile deleted file mode 100644 index 0e2eb2f..0000000 --- a/CentOS-7-ICC-2016/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM cgal/testsuite-docker:centos7 -ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url - -RUN yum -y update; yum clean all -RUN yum -y install \ - gcc-c++ \ - glibc-devel.x86_64 \ - libstdc++-devel.x86_64 \ - tar - -RUN curl -s -SL http://registrationcenter-download.intel.com/akdlm/irc_nas/9781/parallel_studio_xe_2016_update4.tgz | tar xz && \ - cd /parallel_studio_xe_2016_update4/rpm && \ - rpm -ivh --nodeps --ignorearch --excludedocs \ - $(for p in intel-icc-*.x86_64.rpm intel-icc-*.noarch.rpm \ - intel-comp-*.x86_64.rpm intel-comp-*.noarch.rpm \ - intel-mkl-*.x86_64.rpm intel-mkl-*.noarch.rpm \ - intel-openmp-*.x86_64.rpm; do echo $p; done | grep -v -- -jp- ) && \ - cd / && rm -rf parallel_studio_xe_2016_update4 - -RUN echo "if [ "$GUARD" != "1" ]; then source /opt/intel/compilers_and_libraries_2016.4.258/linux/bin/compilervars.sh intel64 \&\& source /opt/intel/compilers_and_libraries_2016.4.258/linux/mkl/bin/mklvars.sh intel64 \&\& source /opt/intel/compilers_and_libraries_2016.4.258/linux/tbb/bin/tbbvars.sh intel64; fi; export GUARD=1" > /etc/profile.d/intel.sh -ENV CC=icc CXX=icpc BASH_ENV=/etc/profile.d/intel.sh -ENV CGAL_TEST_PLATFORM="CentOS7-ICC-2016" -ENV CGAL_CMAKE_FLAGS="('-DCMAKE_CXX_FLAGS=-w1')" -ENV INIT_FILE=/tmp/init.cmake -COPY init.cmake /tmp/init.cmake diff --git a/CentOS-7-ICC-2016/init.cmake b/CentOS-7-ICC-2016/init.cmake deleted file mode 100644 index 149ed65..0000000 --- a/CentOS-7-ICC-2016/init.cmake +++ /dev/null @@ -1,9 +0,0 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "") -SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "") -SET(ACTIVATE_CONCURRENCY ON CACHE BOOL "") -SET(CGAL_ACTIVATE_CONCURRENT_MESH_3 ON CACHE BOOL "") -SET(CGAL_ACTIVATE_CONCURRENT_PSP3 ON CACHE BOOL "") -SET(CGAL_ACTIVATE_CONCURRENT_TRIANGULATION_3 ON CACHE BOOL "") -SET(POLYHEDRON_DEMO_ACTIVATE_CONCURRENCY ON CACHE BOOL "") diff --git a/CentOS-7-ICC-Release/Dockerfile b/CentOS-7-ICC-Release/Dockerfile deleted file mode 100644 index ac43df7..0000000 --- a/CentOS-7-ICC-Release/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM cgal/testsuite-docker:centos7-icc -ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url - -ENV CGAL_TEST_PLATFORM="CentOS7-ICC-Release" -ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-w1 -O3 -DCGAL_NDEBUG')" -ENV INIT_FILE=/tmp/init.cmake -COPY init.cmake /tmp/init.cmake diff --git a/CentOS-7-ICC-Release/init.cmake b/CentOS-7-ICC-Release/init.cmake deleted file mode 100644 index 4fefad8..0000000 --- a/CentOS-7-ICC-Release/init.cmake +++ /dev/null @@ -1,4 +0,0 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_RELEASE "-DCGAL_NDEBUG -O3" CACHE STRING "") -SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "") diff --git a/CentOS-7-ICC-beta/Dockerfile b/CentOS-7-ICC-beta/Dockerfile deleted file mode 100644 index f16d858..0000000 --- a/CentOS-7-ICC-beta/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM cgal/testsuite-docker:centos7 -ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url - -RUN yum -y install \ - wget \ - gcc-c++ \ - glibc-devel.x86_64 \ - libstdc++-devel.x86_64 \ - tar && yum clean all - -COPY config.cfg /tmp/icc-config.cfg - -ARG ACTIVATION_SERIAL_NUMBER - -RUN cd /tmp && \ - if [ -n "$ACTIVATION_SERIAL_NUMBER" ]; then \ - echo ACTIVATION_SERIAL_NUMBER=$ACTIVATION_SERIAL_NUMBER >> /tmp/icc-config.cfg; \ - else \ - wget -O - http://web/ >> /tmp/icc-config.cfg; \ - fi; \ - wget -O icc.tgz http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11681/parallel_studio_xe_2018_beta_update1_cluster_edition_online.tgz && \ - tar -xvzf icc.tgz && \ - cd /tmp/parallel_studio_xe_* && \ - bash ./install.sh --silent=/tmp/icc-config.cfg && \ - cd .. && \ - rm -rf parallel_studio_xe_* icc.tgz && \ - rm /tmp/icc-config.cfg && \ - rm /opt/intel/licenses/*.lic - -COPY intel.sh /etc/profile.d/intel.sh - -ENV CC=icc CXX=icpc BASH_ENV=/etc/profile.d/intel.sh -ENV CGAL_TEST_PLATFORM="CentOS7-ICC-beta" -ENV CGAL_CMAKE_FLAGS="('-DCMAKE_CXX_FLAGS=-w1')" -ENV INIT_FILE=/tmp/init.cmake -COPY init.cmake /tmp/init.cmake diff --git a/CentOS-7-ICC-beta/config.cfg b/CentOS-7-ICC-beta/config.cfg deleted file mode 100755 index 4eb46f0..0000000 --- a/CentOS-7-ICC-beta/config.cfg +++ /dev/null @@ -1,20 +0,0 @@ -ACCEPT_EULA=accept -CONTINUE_WITH_OPTIONAL_ERROR=yes -PSET_INSTALL_DIR=/opt/intel -CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes -PSET_MODE=install -ACTIVATION_TYPE=serial_number -AMPLIFIER_SAMPLING_DRIVER_INSTALL_TYPE=build -AMPLIFIER_DRIVER_ACCESS_GROUP=vtune -AMPLIFIER_DRIVER_PERMISSIONS=666 -AMPLIFIER_LOAD_DRIVER=yes -AMPLIFIER_C_COMPILER=/usr/bin/gcc -AMPLIFIER_KERNEL_SRC_DIR=/lib/modules/4.10.0-28-generic/build -AMPLIFIER_MAKE_COMMAND=/usr/bin/make -AMPLIFIER_INSTALL_BOOT_SCRIPT=yes -AMPLIFIER_DRIVER_PER_USER_MODE=no -MPSS_RESTART_STACK=no -MPSS_INSTALL_STACK=no -MPSS_KNL_INSTALL_STACK=no -ARCH_SELECTED=INTEL64 -COMPONENTS=;intel-comp__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-ps__x86_64;intel-comp-ps-bec__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-openmp__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs__noarch;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-mkl-common__noarch;intel-mkl-common-eula__noarch;intel-mkl-core__x86_64;intel-mkl-core-rt__x86_64;intel-mkl-doc__noarch;intel-mkl-doc-ps__noarch;intel-mkl-gnu__x86_64;intel-mkl-gnu-rt__x86_64;intel-mkl-common-ps__noarch;intel-mkl-core-ps__x86_64;intel-mkl-common-c__noarch;intel-mkl-core-c__x86_64;intel-mkl-common-c-ps__noarch;intel-mkl-tbb__x86_64;intel-mkl-tbb-rt__x86_64;intel-mkl-gnu-c__x86_64;intel-tbb-devel__noarch;intel-tbb-common__noarch;intel-tbb-common-ps__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-icsxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-icsxe-doc__noarch;intel-icsxe-pset diff --git a/CentOS-7-ICC-beta/init.cmake b/CentOS-7-ICC-beta/init.cmake deleted file mode 100644 index 22a0529..0000000 --- a/CentOS-7-ICC-beta/init.cmake +++ /dev/null @@ -1,4 +0,0 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "") -SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "") diff --git a/CentOS-7-ICC-beta/intel.sh b/CentOS-7-ICC-beta/intel.sh deleted file mode 100644 index f0de4c1..0000000 --- a/CentOS-7-ICC-beta/intel.sh +++ /dev/null @@ -1,4 +0,0 @@ -if [ -z "$INTEL_SH_GUARD" ]; then - source /opt/intel/parallel_studio_xe*/compilers_and_libraries*/linux/pkg_bin/compilervars.sh intel64 -fi -export INTEL_SH_GUARD=1 diff --git a/CentOS-7-ICC/Dockerfile b/CentOS-7-ICC/Dockerfile deleted file mode 100644 index efae8ba..0000000 --- a/CentOS-7-ICC/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM cgal/testsuite-docker:centos7 -ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url - -RUN yum -y install \ - wget \ - gcc-c++ \ - glibc-devel.x86_64 \ - libstdc++-devel.x86_64 \ - tar && yum clean all - -COPY config.cfg /tmp/icc-config.cfg - -RUN cd /tmp && \ - wget -O icc.tgz http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11542/parallel_studio_xe_2017_update4_composer_edition_for_cpp_online.tgz && \ - tar -xvzf icc.tgz && \ - cd /tmp/parallel_studio_xe_* && \ - bash ./install.sh --silent=/tmp/icc-config.cfg && \ - cd .. && \ - rm -rf parallel_studio_xe_* icc.tgz && \ - rm /tmp/icc-config.cfg - -COPY intel.sh /etc/profile.d/intel.sh - -ENV CC=icc CXX=icpc BASH_ENV=/etc/profile.d/intel.sh -ENV CGAL_TEST_PLATFORM="CentOS7-ICC" -ENV CGAL_CMAKE_FLAGS="('-DCMAKE_CXX_FLAGS=-w1')" -ENV INIT_FILE=/tmp/init.cmake -COPY init.cmake /tmp/init.cmake diff --git a/CentOS-7-ICC/config.cfg b/CentOS-7-ICC/config.cfg deleted file mode 100644 index fb77b1d..0000000 --- a/CentOS-7-ICC/config.cfg +++ /dev/null @@ -1,9 +0,0 @@ -ACCEPT_EULA=accept -CONTINUE_WITH_OPTIONAL_ERROR=yes -PSET_INSTALL_DIR=/opt/intel -CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes -PSET_MODE=install -ACTIVATION_TYPE=trial_lic -PHONEHOME_SEND_USAGE_DATA=no -ARCH_SELECTED=INTEL64 -COMPONENTS=;intel-comp-l-all-vars__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all__x86_64;intel-comp-l-ps-ss-bec__x86_64;intel-comp-l-ps__x86_64;intel-comp-l-ps-ss__x86_64;intel-openmp-l-all__x86_64;intel-openmp-l-ps-ss-bec__x86_64;intel-openmp-l-ps-ss__x86_64;intel-openmp-l-ps-bec__x86_64;intel-openmp-l-ps-libs__x86_64;intel-openmp-l-ps__x86_64;intel-openmp-l-ps-libs-jp__x86_64;intel-openmp-l-ps-jp__x86_64;intel-tbb-libs__noarch;intel-comp-all-doc__noarch;intel-comp-ps-doc-jp__noarch;intel-icc-doc__noarch;intel-icc-ps-doc__noarch;intel-icc-ps-doc-jp__noarch;intel-icc-ps-ss-doc__noarch;intel-icc-l-all-common__noarch;intel-icc-l-all-common-jp__noarch;intel-icc-l-ps-ss-bec-common__noarch;intel-icc-l-ps-common__noarch;intel-icc-l-all__x86_64;intel-icc-l-ps-ss__x86_64;intel-icc-l-ps__x86_64;intel-icc-l-ps-ss-bec__x86_64;intel-mkl-common__noarch;intel-mkl__x86_64;intel-mkl-rt__x86_64;intel-mkl-ps-rt-jp__x86_64;intel-mkl-doc__noarch;intel-mkl-ps-doc__noarch;intel-mkl-ps-doc-jp__noarch;intel-mkl-gnu__x86_64;intel-mkl-gnu-rt__x86_64;intel-mkl-ps-common__noarch;intel-mkl-ps-common-jp__noarch;intel-mkl-ps-common-64bit__x86_64;intel-mkl-common-c__noarch;intel-mkl-common-c-64bit__x86_64;intel-mkl-ps-common-c__noarch;intel-mkl-doc-c__noarch;intel-mkl-ps-doc-c-jp__noarch;intel-mkl-ps-ss-tbb__x86_64;intel-mkl-ps-ss-tbb-rt__x86_64;intel-mkl-gnu-c__x86_64;intel-tbb-devel__noarch;intel-tbb-common__noarch;intel-tbb-ps-common__noarch;intel-tbb-common-jp__noarch;intel-tbb-doc__noarch;intel-tbb-doc-jp__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-common-doc__noarch;intel-icsxe-pset diff --git a/CentOS-7-ICC/init.cmake b/CentOS-7-ICC/init.cmake deleted file mode 100644 index 22a0529..0000000 --- a/CentOS-7-ICC/init.cmake +++ /dev/null @@ -1,4 +0,0 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "") -SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "") diff --git a/CentOS-7-ICC/intel.sh b/CentOS-7-ICC/intel.sh deleted file mode 100644 index f0de4c1..0000000 --- a/CentOS-7-ICC/intel.sh +++ /dev/null @@ -1,4 +0,0 @@ -if [ -z "$INTEL_SH_GUARD" ]; then - source /opt/intel/parallel_studio_xe*/compilers_and_libraries*/linux/pkg_bin/compilervars.sh intel64 -fi -export INTEL_SH_GUARD=1 diff --git a/CentOS-7-Release/Dockerfile b/CentOS-7-Release/Dockerfile deleted file mode 100644 index a03518b..0000000 --- a/CentOS-7-Release/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM cgal/testsuite-docker:centos7 -ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url - -ENV CGAL_TEST_PLATFORM="CentOS7-Release" -ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-O3 -DCGAL_NDEBUG')" -ENV INIT_FILE=/tmp/init.cmake -COPY init.cmake /tmp/init.cmake diff --git a/CentOS-7-Release/init.cmake b/CentOS-7-Release/init.cmake deleted file mode 100644 index 4fefad8..0000000 --- a/CentOS-7-Release/init.cmake +++ /dev/null @@ -1,4 +0,0 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_RELEASE "-DCGAL_NDEBUG -O3" CACHE STRING "") -SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "") diff --git a/CentOS-7/Dockerfile b/CentOS-7/Dockerfile deleted file mode 100644 index 021dbf7..0000000 --- a/CentOS-7/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM centos:centos7 -ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url - -RUN yum -y update; yum clean all -RUN yum -y install epel-release.noarch; yum clean all -RUN yum -y update; yum -y install \ - boost-devel.x86_64 \ - curl \ - eigen3-devel.noarch \ - gcc-c++ \ - metis-devel \ - glew-devel.x86_64 \ - glibc-devel.x86_64 \ - gmp-devel.x86_64 \ - libstdc++-devel.x86_64 \ - tbb-devel \ - make \ - mpfr-devel.x86_64 \ - qt5-qtbase-devel.x86_64 \ - qt5-qtscript-devel.x86_64 \ - qt5-qtsvg-devel.x86_64 \ - qt5-qttools-devel.x86_64 \ - qt6-qtbase-devel.x86_64 \ - 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 -RUN cd /usr \ - && chmod +x ./cmake.sh - -RUN cd /usr \ -&& ./cmake.sh --skip-license - -# -# The CMAKE_GENERATOR trick is used to pass a CMake variable to each CMake -# run by the testsuite. -# -ENV CGAL_TEST_PLATFORM="CentOS7" CMAKE_GENERATOR="-DCMAKE_POLICY_DEFAULT_CMP0054=OLD" -ENV INIT_FILE=/tmp/init.cmake -COPY init.cmake /tmp/init.cmake - -LABEL org.cgal.releases_to_ignore="^[5-9]" diff --git a/CentOS-7/init.cmake b/CentOS-7/init.cmake deleted file mode 100644 index 149ed65..0000000 --- a/CentOS-7/init.cmake +++ /dev/null @@ -1,9 +0,0 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") -SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "") -SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "") -SET(ACTIVATE_CONCURRENCY ON CACHE BOOL "") -SET(CGAL_ACTIVATE_CONCURRENT_MESH_3 ON CACHE BOOL "") -SET(CGAL_ACTIVATE_CONCURRENT_PSP3 ON CACHE BOOL "") -SET(CGAL_ACTIVATE_CONCURRENT_TRIANGULATION_3 ON CACHE BOOL "") -SET(POLYHEDRON_DEMO_ACTIVATE_CONCURRENCY ON CACHE BOOL "") diff --git a/push.sh b/push.sh index f0a8582..b443dda 100644 --- a/push.sh +++ b/push.sh @@ -12,26 +12,6 @@ then docker push cgal/testsuite-docker:archlinux-clang-cxx17-release docker push cgal/testsuite-docker:archlinux-clang-cxx20-release docker push cgal/testsuite-docker:archlinux-clang-release -elif [ "$1" = CentOS-5 ] -then - docker push cgal/testsuite-docker:centos5 -elif [ "$1" = CentOS-6 ] -then - docker push cgal/testsuite-docker:centos6 - docker push cgal/testsuite-docker:centos6-cxx11-boost157 -elif [ "$1" = CentOS-6-32 ] -then - docker push cgal/testsuite-docker:centos6-32 -elif [ "$1" = CentOS-7-ICC-beta ] -then - docker push cgal/testsuite-docker:centos7-icc-beta -elif [ "$1" = CentOS-7-ICC ] -then - docker push cgal/testsuite-docker:centos7-icc -elif [ "$1" = CentOS-7 ] -then - docker push cgal/testsuite-docker:centos7 - docker push cgal/testsuite-docker:centos7-release elif [ "$1" = Debian-stable ] then docker push cgal/testsuite-docker:debian-stable diff --git a/test.sh b/test.sh index 9dc9bb8..07da5c8 100755 --- a/test.sh +++ b/test.sh @@ -44,36 +44,6 @@ then dockerbuildandtest archlinux-clang-cxx17-release ArchLinux-clang-CXX17-Release dockerbuildandtest archlinux-clang-cxx20-release ArchLinux-clang-CXX20-Release dockerbuildandtest archlinux-clang-release ArchLinux-clang-Release -elif [ "$1" = CentOS-5 ] -then - dockerbuildandtest centos5 CentOS-5 -elif [ "$1" = CentOS-6 ] -then - dockerbuildandtest centos6 CentOS-6 - dockerbuildandtest centos6-cxx11-boost157 CentOS-6-CXX11-Boost157 -elif [ "$1" = CentOS-6-32 ] -then - dockerbuildandtest centos6-32 CentOS-6-32 -elif [ "$1" = CentOS-7-ICC-beta ] -then - if [ -z "$ICC_BETA_ACTIVATION_SERIAL_NUMBER" -a -n "$TRAVIS_PULL_REQUEST" ]; then - echo "The build of this image is deactivated in pull-requests" - else - echo ACTIVATION_SERIAL_NUMBER=$ICC_BETA_ACTIVATION_SERIAL_NUMBER > secret.file - # Trick to share the secret with the building container, without - # having the secret appear in the history of the built image: - # transmit the secret at built time by http. - docker network inspect local || docker network create local - docker run --network local --name web -v $PWD/secret.file:/usr/share/nginx/html/index.html -d nginx - docker build --network local -t cgal/testsuite-docker:centos7-icc-beta ./CentOS-7-ICC-beta - fi -elif [ "$1" = CentOS-7-ICC ] -then - dockerbuildandtest centos7-icc CentOS-7-ICC -elif [ "$1" = CentOS-7 ] -then - dockerbuildandtest centos7 CentOS-7 - dockerbuildandtest centos7-release CentOS-7-Release elif [ "$1" = Debian-stable ] then dockerbuildandtest debian-stable Debian-stable From b173f2b196424539d35b702ff6bbc99b8452aa73 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 10 Oct 2024 11:01:38 +0200 Subject: [PATCH 2/5] Use ACTIONS_RUNNER_DEBUG, and GH Actions log grouping --- push.sh | 2 ++ test.sh | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/push.sh b/push.sh index b443dda..2c5d766 100644 --- a/push.sh +++ b/push.sh @@ -2,6 +2,8 @@ set -e +[ -n "$ACTIONS_RUNNER_DEBUG" ] && set -x + if [ "$1" = ArchLinux ] then docker push cgal/testsuite-docker:archlinux diff --git a/test.sh b/test.sh index 07da5c8..eafa413 100755 --- a/test.sh +++ b/test.sh @@ -2,6 +2,8 @@ set -e +[ -n "$ACTIONS_RUNNER_DEBUG" ] && set -x + curl -o cgal.tar.gz -L $(curl -s https://api.github.com/repos/CGAL/cgal/releases/latest | jq -r .tarball_url) mkdir -p cgal tar -xzf cgal.tar.gz -C cgal --strip-components=1 @@ -27,11 +29,13 @@ function dockerbuild() { } function dockerbuildandtest() { + echo "::group::Building and testing image $1 from $2/Dockerfile" dockerbuild $1 $2 docker run --rm -v $PWD/cgal:/cgal cgal/testsuite-docker:$1 bash -c 'cmake -DWITH_examples=ON -S /cgal -B /build && cmake --build /build -t terrain -v' if command -v python3 >/dev/null; then python3 ./test_container/test_container.py --image cgal/testsuite-docker:$1 --cgal-dir $HOME/cgal fi + echo '::endgroup::' } if [ "$1" = ArchLinux ] From 9267aef4dbd7f4b6fcdb9478dd7e26fa469b15d1 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 10 Oct 2024 11:03:10 +0200 Subject: [PATCH 3/5] merge "Ubuntu" and "Ubuntu-GCC-master' --- .github/workflows/tests.yml | 2 +- push.sh | 2 -- test.sh | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0a3676b..bebb67f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - test_platform: ['ArchLinux','Debian-stable','Debian-testing','Fedora','Fedora-32','Fedora-rawhide','Ubuntu','Ubuntu-GCC-master'] + test_platform: ['ArchLinux','Debian-stable','Debian-testing','Fedora','Fedora-32','Fedora-rawhide','Ubuntu'] fail-fast: false steps: diff --git a/push.sh b/push.sh index 2c5d766..e13a281 100644 --- a/push.sh +++ b/push.sh @@ -43,8 +43,6 @@ then docker push cgal/testsuite-docker:ubuntu-cxx11 docker push cgal/testsuite-docker:ubuntu-no-deprecated-code docker push cgal/testsuite-docker:ubuntu-no-gmp-no-leda -elif [ "$1" = Ubuntu-GCC-master ] -then docker push cgal/testsuite-docker:ubuntu-gcc6 docker push cgal/testsuite-docker:ubuntu-gcc6-cxx1z docker push cgal/testsuite-docker:ubuntu-gcc6-release diff --git a/test.sh b/test.sh index eafa413..a2027dd 100755 --- a/test.sh +++ b/test.sh @@ -77,8 +77,6 @@ then dockerbuildandtest ubuntu-cxx11 Ubuntu-CXX11 dockerbuildandtest ubuntu-no-deprecated-code Ubuntu-NO_DEPRECATED_CODE dockerbuildandtest ubuntu-no-gmp-no-leda Ubuntu-no-gmp-no-leda -elif [ "$1" = Ubuntu-GCC-master ] -then dockerbuildandtest ubuntu-gcc6 Ubuntu-GCC6 dockerbuildandtest ubuntu-gcc6-cxx1z Ubuntu-GCC6-CXX1Z dockerbuildandtest ubuntu-gcc6-release Ubuntu-GCC6-Release From 79c473efc88c5addc96ef49afa31f78a8815563c Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 10 Oct 2024 11:04:20 +0200 Subject: [PATCH 4/5] split build and test groups --- test.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test.sh b/test.sh index a2027dd..42e471e 100755 --- a/test.sh +++ b/test.sh @@ -29,8 +29,11 @@ function dockerbuild() { } function dockerbuildandtest() { - echo "::group::Building and testing image $1 from $2/Dockerfile" + echo "::group::Build image $1 from $2/Dockerfile" dockerbuild $1 $2 + echo '::endgroup::' + + echo "::group::Test image $1" docker run --rm -v $PWD/cgal:/cgal cgal/testsuite-docker:$1 bash -c 'cmake -DWITH_examples=ON -S /cgal -B /build && cmake --build /build -t terrain -v' if command -v python3 >/dev/null; then python3 ./test_container/test_container.py --image cgal/testsuite-docker:$1 --cgal-dir $HOME/cgal From d82644fbe130f696f45bd813f3cccc890e03507e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 10 Oct 2024 11:29:58 +0200 Subject: [PATCH 5/5] ... more grouping --- .github/workflows/tests.yml | 5 +++-- test.sh | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bebb67f..cb012d8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,13 +21,14 @@ jobs: uses: actions/checkout@v4 - name: Compile images - run: bash -x ./test.sh ${{ matrix.test_platform }} + run: bash ./test.sh ${{ matrix.test_platform }} - name: Push images run: | + [ -n "$ACTIONS_RUNNER_DEBUG" ] && set -x 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 }} + bash ./push.sh ${{ matrix.test_platform }} else echo "Don't upload on pull_requests" fi diff --git a/test.sh b/test.sh index 42e471e..5ac8f0c 100755 --- a/test.sh +++ b/test.sh @@ -4,24 +4,28 @@ set -e [ -n "$ACTIONS_RUNNER_DEBUG" ] && set -x -curl -o cgal.tar.gz -L $(curl -s https://api.github.com/repos/CGAL/cgal/releases/latest | jq -r .tarball_url) +CGAL_TARBALL=$(curl -s https://api.github.com/repos/CGAL/cgal/releases/latest | jq -r .tarball_url) +echo "::group::Download and extract CGAL tarball from $CGAL_TARBALL" +curl -o cgal.tar.gz -L "$CGAL_TARBALL" mkdir -p cgal tar -xzf cgal.tar.gz -C cgal --strip-components=1 - if command -v selinuxenabled >/dev/null && selinuxenabled; then chcon -Rt container_file_t cgal fi +echo '::endgroup::' +echo "::group::Install docker-py" if command -v python3 >/dev/null; then python3 -m pip install docker fi +echo '::endgroup::' if [ -n "$GITHUB_SHA" ]; then COMMIT_URL=https://github.com/${GITHUB_REPOSITORY}/blob/${GITHUB_SHA} fi function dockerbuild() { - if [ -z "$GITHUB_SHA" ]; then + if [ -z "$COMMIT_URL" ]; then docker build -t cgal/testsuite-docker:$1 ./$2 else docker build --build-arg dockerfile_url=${COMMIT_URL}/$2/Dockerfile -t cgal/testsuite-docker:$1 ./$2