Commit 7ff3235b authored by Mark Meredith's avatar Mark Meredith
Browse files

Update versions of dependencies

parent c3f14a13

.gitlab-ci.yml

+25 −8
Original line number Diff line number Diff line 
image: python:3.7.7-buster

image: python:3.8.6



stages:

  - build-img

  - test



build-img:

  stage: build-img

  image:

    name: gcr.io/kaniko-project/executor:debug

    entrypoint: [""]

  script:

    - mkdir -p /kaniko/.docker

    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json

    - /kaniko/executor --cache=true --context $CI_PROJECT_DIR --dockerfile ./Dockerfile --destination $CI_REGISTRY_IMAGE:latest

  tags:

    - docker



variables:

  GIT_STRATEGY: fetch

  GIT_SUBMODULE_STRATEGY: normal



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



.test:meson: &conan_def

  stage: test

  image: $CI_REGISTRY_IMAGE:latest

  needs: ['build-img']

  script:

    - python -m pip install conan

    - conan create . -s build_type=$BUILD_TYPE

  tags:

    - mfix-exa

    - docker



test:meson:debug:

  variables:
@@ -25,14 +40,16 @@ test:meson:release: 
  <<: *conan_def



.test:cmake: &cmake_def

  stage: test

  image: $CI_REGISTRY_IMAGE:latest

  needs: ['build-img']

  script:

    - python -m pip install cmake ninja conan

    - cmake -S. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE

    - cmake --build build --target unit_tests_csg

    - cd build

    - ctest

  tags:

    - mfix-exa

    - docker



test:cmake:debug:

  variables:

Dockerfile

0 → 100644
+11 −0
Original line number Diff line number Diff line 
# Docker Image for running csg-eb tests



FROM python:3.8.6



MAINTAINER Mark Meredith <mark.meredith@netl.doe.gov>



RUN wget https://bootstrap.pypa.io/get-pip.py

RUN python3 get-pip.py

RUN python3 -m pip install cmake conan ninja



CMD [ "/bin/bash" ]

conanfile.py

+2 −2
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ class CsgEbConan(ConanFile): 
    options = {"shared": [True, False]}

    default_options = {"shared": False}

    generators = "pkg_config"

    requires = ("catch2/2.13.0", "cgal/5.0.2", "taocpp-pegtl/2.8.3")

    requires = ("catch2/2.13.2", "cgal/5.1", "taocpp-pegtl/2.8.3")

    build_requires = (

        "meson/0.55.0",

        "meson/0.55.3",

        "pkg-config_installer/0.29.2@bincrafters/stable",

    )

    exports_sources = "meson.build", "include/*", "src/*"