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

goodbye conan

parent 107194e7
Loading
Loading
Loading
Loading
+3 −27
Original line number Diff line number Diff line
@@ -11,33 +11,13 @@ workflow:
    - if: $CI_COMMIT_BRANCH == 'main'     # Execute jobs when a new commit is pushed to main branch


build-img:
  stage: build-img
  image:
    name: gcr.io/kaniko-project/executor:debug
    entrypoint: [""]
  script:
    - mkdir -p /kaniko/.docker
    - DOCKER_AUTH=$(echo -n "$DOCKER_HUB_USR:$DOCKER_HUB_PASS" | base64)
    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},\"https://index.docker.io/v1/\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
    - /kaniko/executor --cache=true --context $CI_PROJECT_DIR --dockerfile ./Dockerfile --destination $CI_REGISTRY_IMAGE:latest
  tags:
    - docker-build

###### Test jobs #####

.test:cmake: &cmake_def
  stage: test
  image: $CI_REGISTRY_IMAGE:latest
  needs: ['build-img']
  image: $CI_REGISTRY_IMAGE/nvcc
  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
@@ -86,12 +66,8 @@ test:no_cgal:
  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']
    CI_REGISTRY_IMAGE: ${CI_REGISTRY}/mfix
  image: $CI_REGISTRY_IMAGE/nvcc
  script:
    - conan install -if build -g deploy catch2/2.13.7@
    - |