Commit 7d5e2f3d authored by Charles G Waldman's avatar Charles G Waldman
Browse files

cleanup old Docker setup

parent 2014ce10
Loading
Loading
Loading
Loading
Loading
−22
Changes for .gitlab-ci.yml: 0 added lines, 22 removed lines.
Original line number Diff line number Diff line
image: hello-world:latest

stages:
# - build-img
# - spack-test
  - test

workflow:
@@ -42,26 +40,6 @@ test:no_cgal:
    ENABLE_CGAL: "OFF"
  <<: *cmake_def

# .spack-test:spack: &spack_def
#   stage: test
#   image: $CI_REGISTRY_IMAGE:latest
#   needs: ['build-img']
#   when: manual
#   script:
#     - /usr/local/spack/bin/spack repo add .spack/repo
#     - /usr/local/spack/bin/spack install csg-eb ${NO_CSG}
#   tags:
#     - docker

# spack-test:cgal:
#   variables:
#     NO_CSG: ""
#   <<: *spack_def

# spack-test:no_cgal:
#   variables:
#     NO_CSG: "~cgal"
#   <<: *spack_def

.test:gnumake: &gnumake_def
  stage: test
−5
Changes for CMakeLists.txt: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -14,11 +14,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)

option(CSG_CGAL_ENABLED   "Enable CGAL"   ON)

find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND)
  set( CMAKE_CXX_COMPILER_LAUNCHER ccache )
endif()

find_package(pegtl REQUIRED)

if (CSG_CGAL_ENABLED)
−54

File deleted.

+1 −1
Changes for README.md: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Install the following dependencies before building `csg-eb`
 - [CMake](https://cmake.org) >=3.14
 - [PEGTL](https://github.com/taocpp/PEGTL) for parsing
 - [Catch2](https://github.com/catchorg/Catch2) for testing framework
 - [CGAL](https://www.cgal.org) for geometry computation (CGAL 5.x). Note we currently do not support newer CGAL versions >= 6.0
 - [CGAL](https://www.cgal.org) for geometry computation.


## Build