diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84a9e93a06402777d6b8448ee23a49d31e21d8a8..83e089d13dc3f8033b3515ed8a1932b0eae7cc7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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:dev 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"] 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_MERGE_REQUEST_SOURCE_BRANCH_NAME 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"] # Cleanup