diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76b18ba9991b4cf0dd67fe9782628d1aaa1816e5..d5149753863ef765e7f2cb04efe0593224e29ac3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,7 +74,7 @@ push dev workflow: - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - docker push marconi.aoc.nrao.edu/workspaces/workflow:dev rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "development"' # needs: ["build dev workflow"] push dev capability: @@ -84,10 +84,8 @@ push dev capability: - docker tag marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/capability:dev - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - only: - - development - # rules: - # - if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/) + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "development"' # needs: ["build dev capability"] # Cleanup