Merge branch 'dev' of git.coop:cotech/website into dev

2018-11-29 16:24:47 +00:00 · 2018-11-29 16:24:47 +00:00 · 9de6c66eae
parent 92bee8a897 d308638462
commit 9de6c66eae
1 changed files with 12 additions and 3 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -24,16 +24,25 @@ test:
  except:
  - master

-pages:
+deploy:production:
  stage: deploy
  script:
  - bundle exec jekyll build -d public
  - rsync -aqz public/ cotech@webarch2.co.uk:sites/default/
-  - cd public ; git checkout dev ; cd -
+  artifacts:
+    paths:
+    - public
+  only:
+  - master
+
+
+deploy:dev:
+  stage: deploy
+  script:
  - bundle exec jekyll build -d public
  - rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/
  artifacts:
    paths:
    - public
  only:
-  - master
+  - dev