Skip to content
GitLab
Commit 6527fe04 authored by Alexander Jaust's avatar Alexander Jaust
Browse files

[fix] Fix formatting of CI config

parent 8277ecf5
Pipeline #9672 failed with stages
in 15 seconds
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 6527fe04
......@@ -39,16 +39,6 @@ check-style:
- build-cmake/appl/coupling-ff-pm/fvca-iterative/Makefile
- build-cmake/appl/coupling-ff-pm/fvca-iterative/CTestTestfile.cmake
#build-iterative-coupling:3.3git-iterative-pr-1.6.1:
# image: dumux-precice:3.3git-iterative-pr-1.6.1
# rules:
# - if: '$CI_NIGHTLY_BUILD == "TRUE"'
# <<: *build-iterative-coupling
#build-iterative-coupling:3.3-1.6.1:
# image: dumux-precice:3.3-1.6.1
# <<: *build-iterative-coupling
build-iterative-coupling:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *build-iterative-coupling
......@@ -79,26 +69,10 @@ build-iterative-coupling:master-2.2.1:
- build-cmake/appl/coupling-ff-pm/fvca-monolithic/Makefile
- build-cmake/appl/coupling-ff-pm/fvca-monolithic/CTestTestfile.cmake
#build-monolithic-coupling:3.3git-iterative-pr-1.6.1:
# image: dumux-precice:3.3git-iterative-pr-1.6.1
# rules:
# - if: '$CI_NIGHTLY_BUILD == "TRUE"'
# <<: *build-monolithic-coupling
#build-monolithic-coupling:3.3-1.6.1:
# image: dumux-precice:3.3-1.6.1
# <<: *build-monolithic-coupling
build-monolithic-coupling:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *build-monolithic-coupling
#build-monolithic-coupling:3.3git-iterative-pr-1.6.1:
# image: dumux-precice:3.3git-iterative-pr-1.6.1
# rules:
# - if: '$CI_NIGHTLY_BUILD == "TRUE"'
# <<: *build-monolithic-coupling
build-monolithic-coupling:master-2.2.1:
image: dumux-precice:master-2.2.1
rules:
......@@ -118,22 +92,6 @@ build-monolithic-coupling:master-2.2.1:
- build-cmake/appl/coupling-ff-pm/fvca-iterative/Testing/Temporary/LastTestsFailed.log
- build-cmake/appl/coupling-ff-pm/fvca-iterative/*.log
- build-cmake/appl/coupling-ff-pm/fvca-iterative/*.txt
# needs:
# - build-iterative-coupling
#test-iterative-coupling:3.3git-iterative-pr-1.6.1:
# image: dumux-precice:3.3git-iterative-pr-1.6.1
# rules:
# - if: '$CI_NIGHTLY_BUILD == "TRUE"'
# <<: *test-iterative-coupling
# needs:
# - build-iterative-coupling:3.3git-iterative-pr-1.6.1
#test-iterative-coupling:3.3-1.6.1:
# image: dumux-precice:3.3-1.6.1
# <<: *test-iterative-coupling
# needs:
# - build-iterative-coupling:3.3-1.6.1
test-iterative-coupling:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
......@@ -151,23 +109,6 @@ test-iterative-coupling:3.3-2.2.1:
paths:
- build-cmake/appl/coupling-ff-pm/fvca-monolithic/Testing/Temporary/LastTest.log
- build-cmake/appl/coupling-ff-pm/fvca-monolithic/Testing/Temporary/LastTestsFailed.log
# needs:
# - build-monolithic-coupling
#test-monolithic-coupling:3.3git-iterative-pr-1.6.1:
# image: dumux-precice:3.3git-iterative-pr-1.6.1
# rules:
# - if: '$CI_NIGHTLY_BUILD == "TRUE"'
# <<: *test-monolithic-coupling
# needs:
# - build-monolithic-coupling:3.3git-iterative-pr-1.6.1
#test-monolithic-coupling:3.3-1.6.1:
# image: dumux-precice:3.3-1.6.1
# <<: *test-monolithic-coupling
# needs:
# - build-monolithic-coupling:3.3-1.6.1
test-monolithic-coupling:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
......@@ -195,17 +136,7 @@ test-monolithic-coupling:3.3-2.2.1:
- build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/Makefile
- build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/CTestTestfile.cmake
#build-monolithic-flow-over-step-2d:3.3git-iterative-pr-1.6.1:
# image: dumux-precice:3.3git-iterative-pr-1.6.1
# rules:
# - if: '$CI_NIGHTLY_BUILD == "TRUE"'
# <<: *build-monolithic-flow-over-step-2d
#build-monolithic-flow-over-step-2d:3.3-1.6.1:
# image: dumux-precice:3.3-1.6.1
# <<: *build-monolithic-flow-over-step-2d
build-monolithic-flow-over-step-2d:3.3-1.6.1:
build-monolithic-flow-over-step-2d:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *build-monolithic-flow-over-step-2d
......@@ -226,25 +157,11 @@ build-monolithic-flow-over-step-2d:master-2.2.1:
- build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/Testing/Temporary/LastTest.log
- build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/Testing/Temporary/LastTestsFailed.log
test-monolithic-flow-over-step-2d:3.3git-iterative-pr-1.6.1:
image: dumux-precice:3.3git-iterative-pr-1.6.1
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
<<: *test-monolithic-flow-over-step-2d
needs:
- build-monolithic-flow-over-step-2d:3.3git-iterative-pr-1.6.1
#test-monolithic-flow-over-step-2d:3.3-1.6.1:
# image: dumux-precice:3.3-1.6.1
# <<: *test-monolithic-flow-over-step-2d
# needs:
# - build-monolithic-flow-over-step-2d:3.3-1.6.1
test-monolithic-flow-over-step-2d:3.3-1.6.1:
test-monolithic-flow-over-step-2d:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *test-monolithic-flow-over-step-2d
needs:
- build-monolithic-flow-over-step-2d:3.3-1.6.1
- build-monolithic-flow-over-step-2d:3.3-2.2.1
.build_template: &build-monolithic-ff-pm-3d
stage: build
......@@ -266,16 +183,6 @@ test-monolithic-flow-over-step-2d:3.3-1.6.1:
- build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/Makefile
- build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/CTestTestfile.cmake
build-monolithic-ff-pm-3d:3.3git-iterative-pr-1.6.1:
image: dumux-precice:3.3git-iterative-pr-1.6.1
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
<<: *build-monolithic-ff-pm-3d
#build-monolithic-ff-pm-3d:3.3-1.6.1:
# image: dumux-precice:3.3-1.6.1
# <<: *build-monolithic-ff-pm-3d
build-monolithic-ff-pm-3d:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *build-monolithic-ff-pm-3d
......@@ -300,21 +207,6 @@ build-monolithic-ff-pm-3d:master-2.2.1:
needs:
- build:monolithic:ff-pm-3d
#test-monolithic-ff-pm-3d:3.3git-iterative-pr-1.6.1:
# image: dumux-precice:3.3git-iterative-pr-1.6.1
# rules:
# - if: '$CI_NIGHTLY_BUILD == "TRUE"'
# <<: *test-monolithic-ff-pm-3d
# needs:
# - build-monolithic-ff-pm-3d:3.3git-iterative-pr-1.6.1
#test-monolithic-ff-pm-3d:3.3-1.6.1:
# image: dumux-precice:3.3-1.6.1
# <<: *test-monolithic-ff-pm-3d
# needs:
# - build-monolithic-ff-pm-3d:3.3-1.6.1
test-monolithic-ff-pm-3d:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *test-monolithic-ff-pm-3d
......
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