IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 05700e3e authored by ralfulrich's avatar ralfulrich Committed by Ralf Ulrich
Browse files

fix problem with never-ending CI pipelines

parent 67d9c261
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,7 @@ variables: ...@@ -22,7 +22,7 @@ variables:
# #
# multi-step pipeline for each commit # multi-step pipeline for each commit
# #
# Mote: "Draft:" merge request, non-Draft merge requests and "Ready for Code Review" MR are all # Mote: "Draft/WIP:" merge request, non-Draft/non-WIP merge requests and "Ready for Code Review" MR are all
# handled explicitly # handled explicitly
# #
stages: stages:
...@@ -146,17 +146,11 @@ config-clang-8: ...@@ -146,17 +146,11 @@ config-clang-8:
build-u-18_04: build-u-18_04:
extends: .build extends: .build
image: corsika/devel:u-18.04 image: corsika/devel:u-18.04
needs:
- job: config-u-18_04
artifacts: false
# build for clang # build for clang
build-clang-8: build-clang-8:
extends: .build extends: .build
image: corsika/devel:clang-8 image: corsika/devel:clang-8
needs:
- job: config-clang-8
artifacts: false
...@@ -194,22 +188,16 @@ build-clang-8: ...@@ -194,22 +188,16 @@ build-clang-8:
test-u-18_04: test-u-18_04:
extends: .test extends: .test
image: corsika/devel:u-18.04 image: corsika/devel:u-18.04
needs:
- job: build-u-18_04
artifacts: false
# test for clang # test for clang
test-clang-8: test-clang-8:
extends: .test extends: .test
image: corsika/devel:clang-8 image: corsika/devel:clang-8
needs:
- job: build-clang-8
artifacts: false
####### BUILD-TEST (all builds <= Draft, default) ############## ####### BUILD-TEST (all builds <= Draft/WIP, default) ##############
########################################################## ##########################################################
# the generic build_test template job # the generic build_test template job
...@@ -226,7 +214,7 @@ test-clang-8: ...@@ -226,7 +214,7 @@ test-clang-8:
- set -o pipefail - set -o pipefail
- ctest -j4 - ctest -j4
rules: rules:
- if: '$CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TITLE =~ /^Draft:/' - if: '$CI_MERGE_REQUEST_ID && ($CI_MERGE_REQUEST_TITLE =~ /^Draft:/ || $CI_MERGE_REQUEST_TITLE =~ /^WIP:/)'
allow_failure: false allow_failure: false
- if: $CI_MERGE_REQUEST_ID - if: $CI_MERGE_REQUEST_ID
when: manual when: manual
...@@ -260,7 +248,7 @@ build_test-clang-8: ...@@ -260,7 +248,7 @@ build_test-clang-8:
####### BUILD-TEST-EXAMPLE (only non-Draft) ############## ####### BUILD-TEST-EXAMPLE (only non-Draft/non-WIP) ##############
########################################################## ##########################################################
# generic example template job # generic example template job
...@@ -276,14 +264,14 @@ build_test-clang-8: ...@@ -276,14 +264,14 @@ build_test-clang-8:
- cmake --build . -- -j4 - cmake --build . -- -j4
- set -o pipefail - set -o pipefail
- ctest -j4 - ctest -j4
- make install - make -j4 install
- mkdir -p build_examples - mkdir -p build_examples
- cd build_examples - cd build_examples
- cmake -DCMAKE_BUILT_TYPE=Debug ../install/share/corsika/examples - cmake -DCMAKE_BUILT_TYPE=Debug ../install/share/corsika/examples
- make -j4 - make -j4
- make -j4 run_examples | gzip -v -9 > examples.log.gz - make -j4 run_examples | gzip -v -9 > examples.log.gz
rules: rules:
- if: '$CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TITLE =~ /^Draft:/' - if: '$CI_MERGE_REQUEST_ID && ($CI_MERGE_REQUEST_TITLE =~ /^Draft:/ || $CI_MERGE_REQUEST_TITLE =~ /^WIP:/)'
when: manual when: manual
allow_failure: true allow_failure: true
- if: $CI_COMMIT_BRANCH - if: $CI_COMMIT_BRANCH
...@@ -321,7 +309,7 @@ build_test_example-clang-8: ...@@ -321,7 +309,7 @@ build_test_example-clang-8:
####### INSTALL ############## ####### INSTALL (only manual) ##############
########################################################## ##########################################################
# generic install template job # generic install template job
...@@ -337,32 +325,23 @@ build_test_example-clang-8: ...@@ -337,32 +325,23 @@ build_test_example-clang-8:
- set -o pipefail - set -o pipefail
- make -j2 install - make -j2 install
rules: rules:
- if: '$CI_MERGE_REQUEST_LABELS =~ /Ready for code review/' # run on merge requests, if label 'Ready for code review' is set
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: manual
allow_failure: true
- if: $CI_MERGE_REQUEST_ID - if: $CI_MERGE_REQUEST_ID
when: manual when: manual
allow_failure: true
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: manual when: manual
allow_failure: true - if: $CI_COMMIT_BRANCH
when: manual
allow_failure: true
# install for gcc # install for gcc
install-u-18_04: install-u-18_04:
extends: .install extends: .install
image: corsika/devel:u-18.04 image: corsika/devel:u-18.04
needs:
- job: build-u-18_04
artifacts: false
# install for clang # install for clang
install-clang-8: install-clang-8:
extends: .install extends: .install
image: corsika/devel:clang-8 image: corsika/devel:clang-8
needs:
- job: build-clang-8
artifacts: false
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment