diff options
| author | Micah Anderson <micah@riseup.net> | 2017-04-23 12:17:06 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-04-25 08:10:43 -0400 |
| commit | 076f81ef624e5dc83dfebecf76496b90a87ff8ef (patch) | |
| tree | 3efcd53e0439ae641df3bc88b76d1fee62af9788 | |
| parent | 9ab23ac448d629a362bdba142b685217b2103f07 (diff) | |
CI: deploy_test should run for MRs, but not when merged into master
| -rw-r--r-- | .gitlab-ci.yml | 10 |
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: |