diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cbf7b4ddcd8b1833ba3ee138003dabf1ab6f911..aef541426c3382626b74e22436755db3f3416a23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,8 +68,8 @@ stages: -t ${CI_REGISTRY}/copasi/dune-copasi/dependencies:${DUNECI_OS}-${DUNECI_TOOLCHAIN} . - docker push ${CI_REGISTRY}/copasi/dune-copasi/dependencies:${DUNECI_OS}-${DUNECI_TOOLCHAIN} - docker logout $CI_REGISTRY/copasi/dune-copasi - # only: - # - master + only: + - master .build: &build stage: build @@ -112,8 +112,8 @@ stages: -t $CI_REGISTRY/copasi/dune-copasi/dune-copasi:${DUNECI_OS}-${DUNECI_TOOLCHAIN}-${CI_COMMIT_REF_NAME} . - docker push $CI_REGISTRY/copasi/dune-copasi/dune-copasi:${DUNECI_OS}-${DUNECI_TOOLCHAIN}-${CI_COMMIT_REF_NAME} - docker logout $CI_REGISTRY/copasi/dune-copasi - # only: - # - master + only: + - master # debian gcc diff --git a/docker/dependencies.dockerfile b/docker/dependencies.dockerfile index e1ac976ac50579165823beee019e166242e72704..4381d9ee6866329778e2c70667ef1d2ed049bbfc 100644 --- a/docker/dependencies.dockerfile +++ b/docker/dependencies.dockerfile @@ -6,6 +6,7 @@ ARG TOOLCHAIN="clang-6-17" RUN ln -s /duneci/toolchains/${TOOLCHAIN} /duneci/toolchain RUN echo 'CMAKE_FLAGS+=" -DDUNE_PYTHON_VIRTUALENV_SETUP=1 -DDUNE_PYTHON_VIRTUALENV_PATH=/duneci/modules/dune-python-venv"' >> /duneci/cmake-flags/enable_virtualenv +RUN echo 'CMAKE_FLAGS+=" -DCMAKE_GENERATOR="Ninja' >> /duneci/cmake-flags/cmake_generator RUN duneci-install-module -b support/dune-copasi https://gitlab.dune-project.org/santiago.ospina/dune-common.git \ && duneci-install-module --recursive https://gitlab.dune-project.org/staging/dune-logging.git \ && duneci-install-module -b feature/allow-multidomain-vtk-compare-to-have-same-thresholds https://gitlab.dune-project.org/quality/dune-testtools.git \