summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAdam Carpenter <gitlab@53hor.net>2019-06-03 20:21:47 -0400
committerAdam Carpenter <gitlab@53hor.net>2019-06-03 20:21:47 -0400
commit775a6ea8ed0665bcb2a3de432aca80da57184424 (patch)
tree87c852cfbc4a434955d54bd6d4bcc00f3b994e9e /.gitlab-ci.yml
parent5f6af7ba761eef57adc2d45634fadcdd6108bb34 (diff)
parenta2a168223078198e72dbcfa6c4d755819fe07b83 (diff)
downloadcobalt-site-775a6ea8ed0665bcb2a3de432aca80da57184424.tar.xz
cobalt-site-775a6ea8ed0665bcb2a3de432aca80da57184424.zip
Merge branch 'master' into posts
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