From 05d7bfb273b2b231082957f44cd1b31460068792 Mon Sep 17 00:00:00 2001
From: Andrew Kapuscinski <akapusci@nrao.edu>
Date: Fri, 4 Dec 2020 15:52:04 -0700
Subject: [PATCH] testing push stage when PR is merged
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84a9e93a0..83e089d13 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
--
GitLab