From 4ffbf141dbe822fe7e399e75c2a9f65ca8dfdff6 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 25 Mar 2021 12:25:15 -0600
Subject: [PATCH 1/5] update
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c61bd2c6..ff4b87f57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,6 +57,7 @@ Init:
extends:
- .gradle
script:
+ - env
- ./gradlew dependencies
stage: init
@@ -202,7 +203,7 @@ Trigger nshmp-haz CDK:
rules:
-
if: >
- $CI_PROJECT_PATH == 'ghsc/nshmp'
+ $CI_PROJECT_PATH == 'ghsc/nshmp/nshmp-haz-v2'
&& (
$CI_COMMIT_BRANCH == 'master'
|| $CI_COMMIT_BRANCH == 'production'
@@ -225,7 +226,7 @@ Trigger nshmp-haz-ws CDK:
rules:
-
if: >
- $CI_PROJECT_PATH == 'ghsc/nshmp'
+ $CI_PROJECT_PATH == 'ghsc/nshmp/nshmp-haz-v2'
&& (
$CI_COMMIT_BRANCH == 'master'
|| $CI_COMMIT_BRANCH == 'production'
--
GitLab
From a1263368b63e7db6242b759ebc5ea4b46ba46362 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 25 Mar 2021 12:26:11 -0600
Subject: [PATCH 2/5] update
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff4b87f57..bdf010c30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -226,7 +226,7 @@ Trigger nshmp-haz-ws CDK:
rules:
-
if: >
- $CI_PROJECT_PATH == 'ghsc/nshmp/nshmp-haz-v2'
+ $CI_PROJECT_PATH == 'ghsc/users/bclayton/nshmp/nshmp-haz-v2'
&& (
$CI_COMMIT_BRANCH == 'master'
|| $CI_COMMIT_BRANCH == 'production'
--
GitLab
From 6f873954b4ee4a5da2adcf2e10191b47e26d265e Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 25 Mar 2021 12:26:54 -0600
Subject: [PATCH 3/5] update
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdf010c30..02c25f5b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -228,7 +228,7 @@ Trigger nshmp-haz-ws CDK:
if: >
$CI_PROJECT_PATH == 'ghsc/users/bclayton/nshmp/nshmp-haz-v2'
&& (
- $CI_COMMIT_BRANCH == 'master'
+ $CI_COMMIT_BRANCH == 'issue-459'
|| $CI_COMMIT_BRANCH == 'production'
|| ( $CI_COMMIT_TAG && $CI_COMMIT_TAG != '' )
)
--
GitLab
From 036a832c610edc76cb00da88a7b486e529d49fd8 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 25 Mar 2021 12:27:21 -0600
Subject: [PATCH 4/5] fix pipeline rile
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02c25f5b6..ff4b87f57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -226,9 +226,9 @@ Trigger nshmp-haz-ws CDK:
rules:
-
if: >
- $CI_PROJECT_PATH == 'ghsc/users/bclayton/nshmp/nshmp-haz-v2'
+ $CI_PROJECT_PATH == 'ghsc/nshmp/nshmp-haz-v2'
&& (
- $CI_COMMIT_BRANCH == 'issue-459'
+ $CI_COMMIT_BRANCH == 'master'
|| $CI_COMMIT_BRANCH == 'production'
|| ( $CI_COMMIT_TAG && $CI_COMMIT_TAG != '' )
)
--
GitLab
From e0d7659bcc29fdc6ab610c83448bbac89c77c44f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 25 Mar 2021 12:28:17 -0600
Subject: [PATCH 5/5] fix pipeline rile
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff4b87f57..ff70db323 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,6 @@ Init:
extends:
- .gradle
script:
- - env
- ./gradlew dependencies
stage: init
--
GitLab