From d25ce65a5a723c63e901987c7ffa018a32a87c34 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 13 Jul 2021 10:53:31 -0600
Subject: [PATCH 1/2] update
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71c2f96..4ac30a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ stages:
only:
- branches
- merge_requests
- - master@ghsc/nshmp/disagg-d3
+ - ${CI_DEFAULT_BRANCH}@ghsc/nshmp/disagg-d3
before_script:
- npm ci
--
GitLab
From 80a58561ccbe27552d213a814099ad06fbefe44c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 13 Jul 2021 10:55:24 -0600
Subject: [PATCH 2/2] update
---
.gitlab-ci.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ac30a6..a62de94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,12 @@ stages:
- test
- publish
+# Do not run for merge requests
+workflow:
+ rules:
+ - if: $CI_COMMIT_TAG
+ - if: $CI_COMMIT_BRANCH
+
####
# Template: GitLab runner tags
####
--
GitLab