Commit 46351425 authored by Alexander Jaust's avatar Alexander Jaust
Browse files

Merge branch 'fix-ci-to-use-dumux-master' into 'develop'

Fix ci to use dumux master

See merge request !13
parents ed16c372 7cdad94d
Pipeline #12425 failed with stages
in 11 minutes and 29 seconds
......@@ -52,7 +52,7 @@ build-iterative-coupling:3.4-2.2.1:
build-iterative-coupling:master-2.2.1:
image: dumux-precice:master-2.2.1
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
<<: *build-iterative-coupling
.build_template: &build-monolithic-coupling
......@@ -86,7 +86,7 @@ build-monolithic-coupling:3.4-2.2.1:
build-monolithic-coupling:master-2.2.1:
image: dumux-precice:master-2.2.1
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
<<: *build-monolithic-coupling
......@@ -118,6 +118,14 @@ test-iterative-coupling:3.4-2.2.1:
needs:
- build-iterative-coupling:3.4-2.2.1
test-iterative-coupling:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1
<<: *test-iterative-coupling
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
needs:
- build-iterative-coupling:master-2.2.1
.test_template: &test-monolithic-coupling
stage: test
script:
......@@ -141,6 +149,14 @@ test-monolithic-coupling:3.4-2.2.1:
needs:
- build-monolithic-coupling:3.4-2.2.1
test-monolithic-coupling:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1
<<: *test-monolithic-coupling
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
needs:
- build-monolithic-coupling:master-2.2.1
.build_template: &build-monolithic-flow-over-step-2d
stage: build
script:
......@@ -172,7 +188,7 @@ build-monolithic-flow-over-step-2d:3.4-2.2.1:
build-monolithic-flow-over-step-2d:master-2.2.1:
image: dumux-precice:master-2.2.1
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
<<: *build-monolithic-flow-over-step-2d
.test_template: &test-monolithic-flow-over-step-2d
......@@ -199,6 +215,14 @@ test-monolithic-flow-over-step-2d:3.4-2.2.1:
needs:
- build-monolithic-flow-over-step-2d:3.4-2.2.1
test-monolithic-flow-over-step-2d:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1
<<: *test-monolithic-flow-over-step-2d
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
needs:
- build-monolithic-flow-over-step-2d:master-2.2.1
.build_template: &build-monolithic-ff-pm-3d
stage: build
script:
......@@ -230,7 +254,7 @@ build-monolithic-ff-pm-3d:3.4-2.2.1:
build-monolithic-ff-pm-3d:master-2.2.1:
image: dumux-precice:master-2.2.1
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
<<: *build-monolithic-ff-pm-3d
......@@ -258,4 +282,12 @@ test-monolithic-ff-pm-3d:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1
<<: *test-monolithic-ff-pm-3d
needs:
- build-monolithic-ff-pm-3d:3.4-2.2.1
\ No newline at end of file
- build-monolithic-ff-pm-3d:3.4-2.2.1
test-monolithic-ff-pm-3d:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1
<<: *test-monolithic-ff-pm-3d
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
needs:
- build-monolithic-ff-pm-3d:master-2.2.1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment