IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 38b77021 authored by Ralf Ulrich's avatar Ralf Ulrich
Browse files

Merge branch 'test' into 'master'

CI pipelines also on non-MR branches

See merge request AirShowerPhysics/corsika!239
parents d66d4f13 a2feac5e
No related branches found
No related tags found
No related merge requests found
...@@ -49,7 +49,7 @@ check-copyrights: ...@@ -49,7 +49,7 @@ check-copyrights:
rules: rules:
- if: $CI_MERGE_REQUEST_ID - if: $CI_MERGE_REQUEST_ID
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH
allow_failure: true allow_failure: true
########################################################## ##########################################################
...@@ -65,7 +65,7 @@ check-clang-format: ...@@ -65,7 +65,7 @@ check-clang-format:
rules: rules:
- if: $CI_MERGE_REQUEST_ID - if: $CI_MERGE_REQUEST_ID
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH
allow_failure: true allow_failure: true
...@@ -91,7 +91,7 @@ check-clang-format: ...@@ -91,7 +91,7 @@ check-clang-format:
rules: rules:
- if: $CI_MERGE_REQUEST_ID - if: $CI_MERGE_REQUEST_ID
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH
cache: cache:
paths: paths:
- ${CI_PROJECT_DIR}/build/ - ${CI_PROJECT_DIR}/build/
...@@ -133,7 +133,7 @@ config-clang-8: ...@@ -133,7 +133,7 @@ config-clang-8:
when: manual when: manual
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: manual when: manual
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH
when: manual when: manual
allow_failure: true allow_failure: true
cache: cache:
...@@ -182,7 +182,7 @@ build-clang-8: ...@@ -182,7 +182,7 @@ build-clang-8:
when: manual when: manual
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: manual when: manual
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH
when: manual when: manual
allow_failure: true allow_failure: true
artifacts: artifacts:
...@@ -295,7 +295,7 @@ build_test-clang-8: ...@@ -295,7 +295,7 @@ build_test-clang-8:
when: manual when: manual
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: manual when: manual
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH
when: manual when: manual
allow_failure: true allow_failure: true
artifacts: artifacts:
...@@ -349,7 +349,7 @@ example-clang-8: ...@@ -349,7 +349,7 @@ example-clang-8:
- if: '$CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TITLE =~ /^WIP:/' - if: '$CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TITLE =~ /^WIP:/'
when: manual when: manual
allow_failure: true allow_failure: true
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH
- if: $CI_MERGE_REQUEST_ID - if: $CI_MERGE_REQUEST_ID
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: manual when: manual
...@@ -410,6 +410,7 @@ build_test_example-clang-8: ...@@ -410,6 +410,7 @@ build_test_example-clang-8:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: manual when: manual
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_COMMIT_BRANCH
when: manual when: manual
allow_failure: true allow_failure: true
cache: cache:
......
Subproject commit 0fd890c3e110dae8041654eb190462bd46b5a5ef Subproject commit 47e6e5abb78b8151c9748af44e09efcbee810fac
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