summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAdam Carpenter <gitlab@53hor.net>2019-06-03 20:19:48 -0400
committerAdam Carpenter <gitlab@53hor.net>2019-06-03 20:19:48 -0400
commita2a168223078198e72dbcfa6c4d755819fe07b83 (patch)
tree2e02df5b0f4d5aa13b71878722a1998bf7a7f116 /.gitlab-ci.yml
parentfc2e0aced5013b50ecdbcfcf8ed3fd055ab63da5 (diff)
parentcd1969f17742d9d72b1502cb2a6baa62e8be5c3e (diff)
downloadcobalt-site-a2a168223078198e72dbcfa6c4d755819fe07b83.tar.xz
cobalt-site-a2a168223078198e72dbcfa6c4d755819fe07b83.zip
Merge branch 'construction'
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml17
1 files changed, 5 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f55167e..cc9d1c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,7 @@
test:
- stage: test
- script:
- - bundle exec cobalt build --trace
- except:
- - master
-
-deploy:
- stage: deploy
- script:
- - bundle exec ls _site
- only:
- - master
+ stage: test
+ only:
+ - origin master
+ script:
+ - bundle exec cobalt build --trace