diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a16c2cb1df60382498c09ba989f1bc8bffdcd2a5..9328bd1c5e1ea0e7ba5044c719508040774441bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ check-copyrights: rules: - if: $CI_MERGE_REQUEST_ID - if: $CI_COMMIT_TAG - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH allow_failure: true ########################################################## @@ -65,7 +65,7 @@ check-clang-format: rules: - if: $CI_MERGE_REQUEST_ID - if: $CI_COMMIT_TAG - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH allow_failure: true @@ -91,7 +91,7 @@ check-clang-format: rules: - if: $CI_MERGE_REQUEST_ID - if: $CI_COMMIT_TAG - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH cache: paths: - ${CI_PROJECT_DIR}/build/ @@ -133,7 +133,7 @@ config-clang-8: when: manual - if: $CI_COMMIT_TAG when: manual - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH when: manual allow_failure: true cache: @@ -182,7 +182,7 @@ build-clang-8: when: manual - if: $CI_COMMIT_TAG when: manual - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH when: manual allow_failure: true artifacts: @@ -295,7 +295,7 @@ build_test-clang-8: when: manual - if: $CI_COMMIT_TAG when: manual - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH when: manual allow_failure: true artifacts: @@ -349,7 +349,7 @@ example-clang-8: - if: '$CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TITLE =~ /^WIP:/' when: manual allow_failure: true - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH - if: $CI_MERGE_REQUEST_ID - if: $CI_COMMIT_TAG when: manual @@ -410,6 +410,7 @@ build_test_example-clang-8: - if: $CI_COMMIT_TAG when: manual - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH when: manual allow_failure: true cache: diff --git a/Data b/Data index 0fd890c3e110dae8041654eb190462bd46b5a5ef..47e6e5abb78b8151c9748af44e09efcbee810fac 160000 --- a/Data +++ b/Data @@ -1 +1 @@ -Subproject commit 0fd890c3e110dae8041654eb190462bd46b5a5ef +Subproject commit 47e6e5abb78b8151c9748af44e09efcbee810fac