diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59b3312..e7b2ac4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -156,8 +156,7 @@ trigger_bec: variables: OPHYD_DEVICES_BRANCH: $CI_COMMIT_REF_NAME rules: - - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"' - - if: $CI_PROJECT_PATH == "bec/ophyd_devices" + - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" && $CI_PROJECT_PATH == "bec/ophyd_devices"' semver: stage: Deploy @@ -185,5 +184,4 @@ semver: allow_failure: false rules: - - if: '$CI_COMMIT_REF_NAME == "main"' - - if: $CI_PROJECT_PATH == "bec/ophyd_devices" + - if: '$CI_COMMIT_REF_NAME == "main" && $CI_PROJECT_PATH == "bec/ophyd_devices"''