summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d3afaa5..a85d6483 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,8 +51,14 @@ catalog:
# script:
# - /usr/local/bin/bundle exec rake spec
-build:
+# The deploy_test job is run on any merge request. This is used to ensure that
+# the merge request will deploy and test properly. It is not run when the merge
+# request is accepted into master, instead the 'latest' job below is run
+# instead.
+deploy_test:
stage: deploy
+ except:
+ - master
script:
- su -c '/usr/bin/unbuffer ./ci-build.sh | /usr/bin/ts -s' cirunner
@@ -64,7 +70,7 @@ build:
latest:
stage: deploy
environment:
- name: latest
+ name: staging
only:
- master
script: