From b7b27e610752efce2c0077f44ea4e07739c49af4 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 15 May 2024 09:18:06 +0200 Subject: [PATCH 1/3] Fix conditionnal to trigger multi-project --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb6bc7055c..0fc70cae00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,7 +91,8 @@ stages: trigger-rajaperf: stage: multi-project rules: - - if: '$CI_COMMIT_BRANCH == "${MP_BRANCH}" || $MULTI_PROJECT == "ON"' #run only if ... + - if: '$CI_COMMIT_BRANCH != $MP_BRANCH && $MULTI_PROJECT != "ON"' #never run unless + when: never variables: UPDATE_RAJA: ${MP_BRANCH} trigger: From b2ebfcd9c0d9e56f501304c7885dccd057c3803c Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 15 May 2024 09:49:23 +0200 Subject: [PATCH 2/3] New attempt --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fc70cae00..552c57816c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,6 +93,7 @@ trigger-rajaperf: rules: - if: '$CI_COMMIT_BRANCH != $MP_BRANCH && $MULTI_PROJECT != "ON"' #never run unless when: never + - when: on_success variables: UPDATE_RAJA: ${MP_BRANCH} trigger: From 9732085df599c51e78e1facaa99ef18749b497d2 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 15 May 2024 11:07:13 +0200 Subject: [PATCH 3/3] Test new rules syntax --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 552c57816c..4c47435079 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive ##### PROJECT VARIABLES - MP_BRANCH: "develop" + MP_BRANCH: "woptim/multi-project" # We build the projects in the CI clone directory (used in # script/gitlab/build_and_test.sh script). # TODO: add a clean-up mechanism. @@ -91,7 +91,7 @@ stages: trigger-rajaperf: stage: multi-project rules: - - if: '$CI_COMMIT_BRANCH != $MP_BRANCH && $MULTI_PROJECT != "ON"' #never run unless + - if: $CI_COMMIT_BRANCH != $MP_BRANCH && $MULTI_PROJECT != "ON" #never run unless when: never - when: on_success variables: