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

Merge branch 'SSA-6730' into 'development'

testing push stage when PR is merged

See merge request ssa/data!3
parents f582fbce 05d7bfb2
No related branches found
No related tags found
No related merge requests found
...@@ -65,7 +65,7 @@ push dev workflow: ...@@ -65,7 +65,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:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
- docker push marconi.aoc.nrao.edu/workspaces/workflow:dev - docker push marconi.aoc.nrao.edu/workspaces/workflow:dev
rules: rules:
- if: $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/ - if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/)
# needs: ["build dev workflow"] # needs: ["build dev workflow"]
push dev capability: push dev capability:
...@@ -76,7 +76,7 @@ push dev capability: ...@@ -76,7 +76,7 @@ push dev capability:
- docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA - 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 - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
rules: rules:
- if: $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/ - if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/)
# needs: ["build dev capability"] # needs: ["build dev capability"]
# Cleanup # 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