From 9a9d525c9aa9729dc4171e412ec9ffd36bfb15d4 Mon Sep 17 00:00:00 2001
From: Travis Rivers <trivers@contractor.usgs.gov>
Date: Mon, 31 Aug 2020 16:30:29 -0600
Subject: [PATCH] update gitlab yml
---
.gitlab-ci.yml | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d07f60ca..35de6198 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,25 +115,6 @@ variables:
tags:
- mage02
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-.production:
- except:
- - ^.*beta.*$
- - ^.*-rc.*$
- only:
- - tags@ghsc/geomag/geomag-algorithms
- - production@ghsc/geomag/geomag-algorithms
- when: manual
-
-=======
->>>>>>> remove production template
-.staging:
- only:
- - master@ghsc/geomag/geomag-algorithms
- - tags@ghsc/geomag/geomag-algorithms
->>>>>>> add production template
## --------------------------------------------------
# Test Stage
## --------------------------------------------------
@@ -190,6 +171,7 @@ Deploy Mage01:
Deploy Mage02:
extends:
- .deploy
+ - .production
- .mage
- .mage02
variables:
--
GitLab