Skip to content
Snippets Groups Projects
Commit fe7ddf1e authored by Andrew Kapuscinski's avatar Andrew Kapuscinski
Browse files

added conditional to only push if target branch for merge is development

parent f334718a
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment