femmefaytale
/
cotech-website
forked from autonomic-cooperative/cotech-website
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fixup-ci' into 'dev' 

Fixup CI

See merge request cotech/website!5
This commit is contained in:
Nick Sellen 2018-11-29 16:13:00 +00:00
parent a2394a42d7 af19045146
commit d308638462
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci.yml
View File

@ -24,16 +24,25 @@ test:
except: except:
- master - master
pages: deploy:production:
stage: deploy stage: deploy
script: script:
- bundle exec jekyll build -d public - bundle exec jekyll build -d public
- rsync -aqz public/ cotech@webarch2.co.uk:sites/default/ - 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 - bundle exec jekyll build -d public
- rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/ - rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/
artifacts: artifacts:
paths: paths:
- public - public
only: only:
- master - dev