From f9ed34ba06ff099a96715567f81685d9372bb90a Mon Sep 17 00:00:00 2001 From: Will Fantom Date: Wed, 16 Apr 2025 08:15:50 +0000 Subject: [PATCH 1/2] Update CI to run on merge requests --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2d482b..7f39180 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,3 +12,7 @@ build: - mkdir build - cd build && cmake -DBUILD_TESTING=On -DARMRAL_ENABLE_COVERAGE=On .. && make -j check && gcovr -r .. coverage: /^TOTAL.*\s+(\d+\%)$/ + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_TAG + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -- GitLab From 71a35b4b1e739afc4f3d8ca78368104cefda0e2c Mon Sep 17 00:00:00 2001 From: Will Fantom Date: Wed, 16 Apr 2025 09:02:18 +0000 Subject: [PATCH 2/2] Run CI on merge and push --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f39180..f696240 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,5 +14,4 @@ build: coverage: /^TOTAL.*\s+(\d+\%)$/ rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - - if: $CI_COMMIT_TAG - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == "push" -- GitLab