Commit e5ec3119 authored by Deepak Rangarajan's avatar Deepak Rangarajan
Browse files

remove conan from ci

parent 935fdbd1

.gitlab-ci.yml

+0 −19
Original line number Diff line number Diff line
@@ -30,17 +30,9 @@ build-img: 
  image: $CI_REGISTRY_IMAGE:latest

  needs: ['build-img']

  script:

    - conan install -if build -g cmake_find_package catch2/2.13.7@

    - |

      if [ "$ENABLE_CGAL" == "ON" ]; then

        conan install -if build -g cmake_find_package cgal/5.2.1@

      fi

    - conan install -if build -g cmake_find_package taocpp-pegtl/3.2.1@



    - cmake -S.

            -Bbuild

            -GNinja

            -DCMAKE_MODULE_PATH=$PWD/build

            -DCMAKE_BUILD_TYPE=Debug

            -DCSG_CGAL_ENABLED=${ENABLE_CGAL}

            -DCMAKE_CXX_FLAGS="-pedantic-errors"
@@ -84,20 +76,9 @@ spack:no_cgal: 
.test:gnumake: &gnumake_def

  stage: test

  variables:

    BUILD: ${CI_PROJECT_DIR}/build

    BOOST_HOME: ${BUILD}/boost

    CATCH2_HOME: ${BUILD}/catch2

    CGAL_HOME: ${BUILD}/cgal

    PEGTL_HOME: ${BUILD}/taocpp-pegtl

  image: $CI_REGISTRY_IMAGE:latest

  needs: ['build-img']

  script:

    - conan install -if build -g deploy catch2/2.13.7@

    - |

      if [ "$ENABLE_CGAL" == "ON" ]; then

        conan install -if build -g deploy cgal/5.2.1@

      fi

    - conan install -if build -g deploy taocpp-pegtl/3.2.1@

    - make install DESTDIR=the_destination

  tags:

    - docker

Dockerfile

+24 −1
Original line number Diff line number Diff line
@@ -15,15 +15,38 @@ RUN apt-get -qq update \ 
  pkg-config=0.29.* \

  python3-pip=20.* \

  python3-venv=3.8.* \

  libgmp-dev \

  libmpfr-dev \

  libboost-all-dev \

  && apt-get clean && rm -rf /var/lib/apt/lists/* \



  && pip3 install --no-cache-dir \

  cmake==3.* \

  conan==1.* \

  ninja==1.* \



  && git clone -c feature.manyFiles=true https://github.com/spack/spack.git /usr/local/spack \



  && PATH=/usr/local/spack/bin:$PATH



RUN git clone --depth 1 --branch v2.13.7 https://github.com/catchorg/Catch2

WORKDIR /Catch2

RUN cmake -S . -B build -DCATCH_BUILD_TESTING=OFF

RUN cmake --build build --target install

WORKDIR /



RUN git clone --depth 1 --branch v5.3 https://github.com/CGAL/cgal

WORKDIR /cgal

RUN cmake -S . -B build

RUN cmake --build build --target install

WORKDIR /



RUN git clone --branch 3.2.2 https://github.com/taocpp/PEGTL

WORKDIR /PEGTL

RUN cmake -S . -B build -DPEGTL_BUILD_TESTS=OFF -DPEGTL_BUILD_EXAMPLES=OFF

RUN cmake --build build --target install

WORKDIR /



WORKDIR /home/user

USER user



CMD [ "/bin/bash" ]