From 4bd6c32048bf1267edb4e8c21b9f4f225e60f144 Mon Sep 17 00:00:00 2001 From: Simon Praetorius <simon.praetorius@tu-dresden.de> Date: Wed, 19 Feb 2020 00:41:10 +0100 Subject: [PATCH] updated ci-configuration --- .gitlab-ci.yml | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4aeed80..c0e06d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,24 +1,18 @@ --- -dune-2.6 gcc-6-14: - image: registry.dune-project.org/docker/ci/dune-pdelab-deps:2.6-debian-9-gcc-6-14 - script: duneci-standard-test -dune-2.6 gcc-8-17: - image: registry.dune-project.org/docker/ci/dune-pdelab-deps:2.6-debian-10-gcc-8-17 - script: duneci-standard-test +include: + - "https://gitlab.mn.tu-dresden.de/amdis/ci-config/raw/master/config/common/master.yml" + - "https://gitlab.mn.tu-dresden.de/amdis/ci-config/raw/master/jobs/common/master.yml" -dune-2.6 clang-7-17: - image: registry.dune-project.org/docker/ci/dune-pdelab-deps:2.6-debian-10-clang-7-libcpp-17 - script: duneci-standard-test - -dune-git gcc-7-14: - image: registry.dune-project.org/docker/ci/dune-pdelab-deps:git-debian-10-gcc-7-14 - script: duneci-standard-test - -dune-git gcc-8-17: - image: registry.dune-project.org/docker/ci/dune-pdelab-deps:git-debian-10-gcc-8-noassert-17 - script: duneci-standard-test - -dune-git clang-7-17: - image: registry.dune-project.org/docker/ci/dune-pdelab-deps:git-debian-10-clang-7-libcpp-17 - script: duneci-standard-test \ No newline at end of file +before_script: + - . /duneci/bin/duneci-init-job + - duneci-install-module https://gitlab.dune-project.org/core/dune-common.git + - duneci-install-module https://gitlab.dune-project.org/core/dune-geometry.git + - duneci-install-module https://gitlab.dune-project.org/staging/dune-uggrid.git + - duneci-install-module https://gitlab.dune-project.org/core/dune-grid.git + - duneci-install-module https://gitlab.dune-project.org/core/dune-istl.git + - duneci-install-module https://gitlab.dune-project.org/core/dune-localfunctions.git + - duneci-install-module https://gitlab.dune-project.org/staging/dune-typetree.git + - duneci-install-module https://gitlab.dune-project.org/staging/dune-functions.git + - duneci-install-module https://gitlab.dune-project.org/extensions/dune-polygongrid.git + - duneci-install-module https://gitlab.dune-project.org/extesnions/dune-alugrid.git -- GitLab