summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml20
1 files changed, 15 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2cef28e0..7b0f8852 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,26 +60,36 @@ deploy_test:
except:
- master
script:
- - su -c '/usr/bin/unbuffer ./ci-build.sh' cirunner
+ - su -c '/usr/bin/unbuffer bash -o pipefail ./ci-build.sh | /usr/bin/ts' cirunner
# Latest job will only run on the master branch, which means all merge requests
# that are created from branches don't get to deploy to the latest-ci server.
# When a merge request is merged, then the latest job will deploy the code to
# the latest provider, and the deployment will be recorded in an environment
# named 'latest'
-latest:
+ci.leap.se:
stage: deploy
environment:
name: staging
only:
- - master
+ - master
+ script:
+ - su -c '/usr/bin/unbuffer ./ci-build.sh' cirunner
+
+demo.bitmask.net:
+ stage: deploy
+ environment:
+ name: production/vpn
+ only:
+ - master
+ when: manual
script:
- su -c '/usr/bin/unbuffer ./ci-build.sh' cirunner
-production:
+mail.bitmask.net:
stage: deploy
environment:
- name: production
+ name: production/mail
only:
- master
when: manual