5
0
mirror of https://git.coop/cotech/website.git synced 2024-11-22 06:33:07 +00:00

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

This commit is contained in:
Martin Burchell 2018-11-29 16:24:47 +00:00
commit 9de6c66eae

View File

@ -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