From a2feac5e204a9c0b02cee24a260e91ac49dfb991 Mon Sep 17 00:00:00 2001
From: Ralf Ulrich <ralf.ulrich@kit.edu>
Date: Tue, 21 Jul 2020 07:06:35 +0200
Subject: [PATCH] CI pipelines also on non-MR branches
---
.gitlab-ci.yml | 15 ++++++++-------
Data | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a16c2cb1d..9328bd1c5 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 0fd890c3e..47e6e5abb 160000
--- a/Data
+++ b/Data
@@ -1 +1 @@
-Subproject commit 0fd890c3e110dae8041654eb190462bd46b5a5ef
+Subproject commit 47e6e5abb78b8151c9748af44e09efcbee810fac
--
GitLab